From srdjan at catalyst.net.nz  Thu Aug  1 01:41:32 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu,  1 Aug 2013 11:41:32 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] C4::Branch.pm needs unit tests
Message-ID: <1375314092-30477-1-git-send-email-srdjan@catalyst.net.nz>

From: Kenza Zaki <kenza.zaki at biblibre.com>

Unit tests are wrap in a transaction.

To test:
prove t/db_dependent/Branch.t
t/db_dependent/Branch.t .. 1/36 Using a hash as a reference is deprecated at t/db_dependent/Branch.t line 207.
t/db_dependent/Branch.t .. ok
All tests successful.
Files=1, Tests=36,  1 wallclock secs ( 0.02 usr  0.02 sys +  0.13 cusr  0.01 csys =  0.18 CPU)
Result: PASS

http://bugs.koha-community.org/show_bug.cgi?id=10508
Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 t/db_dependent/Branch.t | 297 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 290 insertions(+), 7 deletions(-)

diff --git a/t/db_dependent/Branch.t b/t/db_dependent/Branch.t
index cc19f21..ffa2346 100644
--- a/t/db_dependent/Branch.t
+++ b/t/db_dependent/Branch.t
@@ -21,7 +21,7 @@ use Modern::Perl;
 use C4::Context;
 use Data::Dumper;
 
-use Test::More tests => 6;
+use Test::More tests => 36;
 
 use C4::Branch;
 
@@ -30,6 +30,29 @@ BEGIN {
     use lib $FindBin::Bin;
     use_ok('C4::Branch');
 }
+can_ok(
+    'C4::Branch', qw(
+      GetBranchCategory
+      GetBranchName
+      GetBranch
+      GetBranches
+      GetBranchesLoop
+      GetBranchDetail
+      get_branchinfos_of
+      ModBranch
+      CheckBranchCategorycode
+      GetBranchInfo
+      GetCategoryTypes
+      GetBranchCategories
+      GetBranchesInCategory
+      ModBranchCategoryInfo
+      DelBranch
+      DelBranchCategory
+      CheckCategoryUnique
+      mybranch
+      GetBranchesCount)
+);
+
 
 # Start transaction
 my $dbh = C4::Context->dbh;
@@ -39,8 +62,127 @@ $dbh->{RaiseError} = 1;
 # clear the slate
 $dbh->do('DELETE FROM branchcategories');
 
-my @category_types = GetCategoryTypes();
-is_deeply(\@category_types, [ 'searchdomain', 'properties' ], 'received expected library category types');
+# Start test
+
+my $count = GetBranchesCount;
+like( $count, '/^\d+$/', "the count is a number" );
+
+#add 2 branches
+my $b1 = {
+    add            => 1,
+    branchcode     => 'BRA',
+    branchname     => 'BranchA',
+    branchaddress1 => 'adr1A',
+    branchaddress2 => 'adr2A',
+    branchaddress3 => 'adr3A',
+    branchzip      => 'zipA',
+    branchcity     => 'cityA',
+    branchstate    => 'stateA',
+    branchcountry  => 'countryA',
+    branchphone    => 'phoneA',
+    branchfax      => 'faxA',
+    branchemail    => 'emailA',
+    branchurl      => 'urlA',
+    branchip       => 'ipA',
+    branchprinter  => undef,
+    branchnotes    => 'noteA',
+    opac_info      => 'opacA'
+};
+my $b2 = {
+    branchcode     => 'BRB',
+    branchname     => 'BranchB',
+    branchaddress1 => 'adr1B',
+    branchaddress2 => 'adr2B',
+    branchaddress3 => 'adr3B',
+    branchzip      => 'zipB',
+    branchcity     => 'cityB',
+    branchstate    => 'stateB',
+    branchcountry  => 'countryB',
+    branchphone    => 'phoneB',
+    branchfax      => 'faxB',
+    branchemail    => 'emailB',
+    branchurl      => 'urlB',
+    branchip       => 'ipB',
+    branchprinter  => undef,
+    branchnotes    => 'noteB',
+    opac_info      => 'opacB',
+};
+ModBranch($b1);
+is( ModBranch($b2), undef, 'the field add is missing' );
+
+$b2->{add} = 1;
+ModBranch($b2);
+is( GetBranchesCount, $count + 2, "two branches added" );
+
+#Test DelBranch
+
+is( DelBranch( $b2->{branchcode} ), 1,          "One row affected" );
+is( GetBranchesCount,               $count + 1, "branch BRB deleted" );
+
+#Test GetBranchName
+is( GetBranchName( $b1->{branchcode} ),
+    $b1->{branchname}, "GetBranchName returns the right name" );
+
+#Test GetBranchDetail
+my $branchdetail = GetBranchDetail( $b1->{branchcode} );
+$branchdetail->{add} = 1;
+$b1->{issuing}       = undef;    # Not used in DB
+is_deeply( $branchdetail, $b1, 'branchdetail is right' );
+
+#Test Getbranches
+my $branches = GetBranches;
+is( scalar( keys %$branches ),
+    GetBranchesCount, "GetBranches returns the right number of branches" );
+
+#Test ModBranch
+
+$b1 = {
+    branchcode     => 'BRA',
+    branchname     => 'BranchA modified',
+    branchaddress1 => 'adr1A modified',
+    branchaddress2 => 'adr2A modified',
+    branchaddress3 => 'adr3A modified',
+    branchzip      => 'zipA modified',
+    branchcity     => 'cityA modified',
+    branchstate    => 'stateA modified',
+    branchcountry  => 'countryA modified',
+    branchphone    => 'phoneA modified',
+    branchfax      => 'faxA modified',
+    branchemail    => 'emailA modified',
+    branchurl      => 'urlA modified',
+    branchip       => 'ipA modified',
+    branchprinter  => undef,
+    branchnotes    => 'notesA modified',
+    opac_info      => 'opacA modified'
+};
+
+ModBranch($b1);
+is( GetBranchesCount, $count + 1,
+    "A branch has been modified, no new branch added" );
+$branchdetail = GetBranchDetail( $b1->{branchcode} );
+$b1->{issuing} = undef;
+is_deeply( $branchdetail, $b1 , "GetBranchDetail gives the details of BRA");
+
+#Test categories
+my $categories = GetBranchCategories;
+my $count_cat  = scalar( keys $categories );
+
+my $cat1 = {
+    add              => 1,
+    categorycode     => 'CAT1',
+    categoryname     => 'catname1',
+    codedescription  => 'catdesc1',
+    categorytype     => 'cattype1',
+    show_in_pulldown => 1
+};
+my $cat2 = {
+    add              => 1,
+    categorycode     => 'CAT2',
+    categoryname     => 'catname2',
+    categorytype     => 'catype2',
+    codedescription  => 'catdesc2',
+    show_in_pulldown => 1
+};
 
 my %new_category = (
     categorycode     => 'LIBCATCODE',
@@ -49,21 +191,162 @@ my %new_category = (
     categorytype     => 'searchdomain',
     show_in_pulldown => 1,
 );
+
 ModBranchCategoryInfo({
     add => 1,
     %new_category,
 });
 
+ModBranchCategoryInfo($cat1);
+ModBranchCategoryInfo($cat2);
+
+$categories = GetBranchCategories;
+is( scalar( keys $categories ), $count_cat + 3, "Two categories added" );
+delete $cat1->{add};
+delete $cat2->{add};
+delete %new_category->{add};
+is_deeply($categories, [ $cat1,$cat2,\%new_category ], 'retrieve all expected library categories (bug 10515)');
+
+#test GetBranchCategory
+my $cat1detail = GetBranchCategory( $cat1->{categorycode} );
+delete $cat1->{add};
+is_deeply( $cat1detail, $cat1, 'CAT1 details are right' );
 my $category = GetBranchCategory('LIBCATCODE');
 is_deeply($category, \%new_category, 'fetched newly added library category');
 
+#Test DelBranchCategory
+my $del = DelBranchCategory( $cat2->{categorycode} );
+is( $del, 1, 'One row affected' );
+
+$categories = GetBranchCategories;
+is( scalar( keys $categories ), $count_cat + 2, "Category  CAT2 deleted" );
+
+my $cat2detail = GetBranchCategory( $cat2->{categorycode} );
+is( $cat2detail, undef, 'CAT2 doesnt exist' );
+
 $category = GetBranchCategory();
 is($category, undef, 'retrieve library category only if code is supplied (bug 10515)');
 
-my $categories = GetBranchCategories();
-is_deeply($categories, [ \%new_category ], 'retrieve all expected library categories (bug 10515)');
+#Test CheckBranchCategoryCode
+my $check1 = CheckBranchCategorycode( $cat1->{categorycode} );
+my $check2 = CheckBranchCategorycode( $cat2->{categorycode} );
+like( $check1, '/^\d+$/', "CheckBranchCategorycode returns a number" );
+
+$b2->{CAT1} = 1;
+ModBranch($b2);
+is( GetBranchesCount, $count + 2, 'BRB added' );
+is(
+    CheckBranchCategorycode( $cat1->{categorycode} ),
+    $check1 + 1,
+    'BRB added to CAT1'
+);
+
+#Test GetBranchInfo
+my $b1info = GetBranchInfo( $b1->{branchcode} );
+$b1->{categories} = [];
+is_deeply( @$b1info[0], $b1, 'BRA has no categories' );
+
+my $b2info = GetBranchInfo( $b2->{branchcode} );
+my @cat    = ( $cat1->{categorycode} );
+delete $b2->{add};
+delete $b2->{CAT1};
+$b2->{issuing}    = undef;
+$b2->{categories} = \@cat;
+is_deeply( @$b2info[0], $b2, 'BRB has the category CAT1' );
+
+ModBranchCategoryInfo({add => 1,%$cat2});
+$categories = GetBranchCategories;
+is( scalar( keys $categories ), $count_cat + 3, "Two categories added" );
+$b2 = {
+    branchcode     => 'BRB',
+    branchname     => 'BranchB',
+    branchaddress1 => 'adr1B',
+    branchaddress2 => 'adr2B',
+    branchaddress3 => 'adr3B',
+    branchzip      => 'zipB',
+    branchcity     => 'cityB',
+    branchstate    => 'stateB',
+    branchcountry  => 'countryB',
+    branchphone    => 'phoneB',
+    branchfax      => 'faxB',
+    branchemail    => 'emailB',
+    branchurl      => 'urlB',
+    branchip       => 'ipB',
+    branchprinter  => undef,
+    branchnotes    => 'noteB',
+    opac_info      => 'opacB',
+    CAT1           => 1,
+    CAT2           => 1
+};
+ModBranch($b2);
+$b2info = GetBranchInfo( $b2->{branchcode} );
+is(
+    CheckBranchCategorycode( $cat2->{categorycode} ),
+    $check2 + 1,
+    'BRB added to CAT2'
+);
+push( @cat, $cat2->{categorycode} );
+delete $b2->{CAT1};
+delete $b2->{CAT2};
+$b2->{issuing}    = undef;
+$b2->{categories} = \@cat;
+is_deeply( @$b2info[0], $b2, 'BRB has the category CAT1 and CAT2' );
+
+#Test GetBranchesInCategory
+my $brCat1 = GetBranchesInCategory( $cat1->{categorycode} );
+my @b      = ( $b2->{branchcode} );
+is_deeply( $brCat1, \@b, 'CAT1 has branch BRB' );
+
+my $b3 = {
+    add            => 1,
+    branchcode     => 'BRC',
+    branchname     => 'BranchC',
+    branchaddress1 => 'adr1C',
+    branchaddress2 => 'adr2C',
+    branchaddress3 => 'adr3C',
+    branchzip      => 'zipC',
+    branchcity     => 'cityC',
+    branchstate    => 'stateC',
+    branchcountry  => 'countryC',
+    branchphone    => 'phoneC',
+    branchfax      => 'faxC',
+    branchemail    => 'emailC',
+    branchurl      => 'urlC',
+    branchip       => 'ipC',
+    branchprinter  => undef,
+    branchnotes    => 'noteC',
+    opac_info      => 'opacC',
+    CAT1           => 1,
+    CAT2           => 1
+};
+ModBranch($b3);
+$brCat1 = GetBranchesInCategory( $cat1->{categorycode} );
+push( @b, $b3->{branchcode} );
+is_deeply( $brCat1, \@b, 'CAT1 has branch BRB and BRC' );
+is(
+    CheckBranchCategorycode( $cat1->{categorycode} ),
+    $check1 + 2,
+    'BRC has been added to CAT1'
+);
+
+#Test CheckCategoryUnique
+is( CheckCategoryUnique('CAT2'),          0, 'CAT2 exists' );
+is( CheckCategoryUnique('CAT_NO_EXISTS'), 1, 'CAT_NO_EXISTS doesnt exist' );
+
+#Test GetCategoryTypes
+my @category_types = GetCategoryTypes();
+is_deeply(\@category_types, [ 'searchdomain', 'properties' ], 'received expected library category types');
 
 $categories = GetBranchCategories(undef, undef, 'LIBCATCODE');
-is_deeply($categories, [ { %new_category, selected => 1 } ], 'retrieve expected, eselected library category (bug 10515)');
+is_deeply($categories, [ {%$cat1}, {%$cat2},{ %new_category, selected => 1 } ], 'retrieve expected, eselected library category (bug 10515)');
+
+#TODO later: test mybranchine and onlymine
+# Actually we cannot mock C4::Context->userenv in unit tests
+
+#Test GetBranchesLoop
+my $loop = GetBranchesLoop;
+is( scalar(@$loop), GetBranchesCount, 'There is the right number of branches' );
+
+# End transaction
+$dbh->rollback;
 
-$dbh->rollback();
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Thu Aug  1 08:12:15 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Thu,  1 Aug 2013 18:12:15 +1200
Subject: [Koha-patches] [PATCH] Bug 10664 : Software error in
	overdue_notices.pl if there is no active currency
Message-ID: <1375337535-9557-1-git-send-email-srdjan@catalyst.net.nz>

From: Sophie Meynieux <sophie.meynieux at biblibre.com>

If there is no active currency, when running overdue_notices.pl you get a sofware error "Can't use an undefined value as a HASH reference" on GetCurrency() function call

With this patch, if there is no active currency, fines are formated by default 0,00 and notices are correctly generated.

Test plan :
- have at least one borrower with overdue that should trigger a notice
- verify that there is no active currency (Adminitration > Currency & Exchange rates)
- run misc/cronjobs/overdue_notices.pl -v -n (to get the notice directly on output)

=> without the patch you get the software error
=> with the patch, notices are correctly generated

If an active currency is defined, the script overdue_notices.pl runs the same with or without patch

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 misc/cronjobs/overdue_notices.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl
index 5f285c0..04ccf5a 100755
--- a/misc/cronjobs/overdue_notices.pl
+++ b/misc/cronjobs/overdue_notices.pl
@@ -688,7 +688,8 @@ sub parse_letter {
         $tables{'branches'} = $p;
     }
 
-    my $currency_format = GetCurrency()->{currency};
+    my $currencies = GetCurrency();
+    my $currency_format = $currencies->{currency} if defined($currencies);
 
     my @item_tables;
     if ( my $i = $params->{'items'} ) {
-- 
1.8.1.2

From nengard at bywatersolutions.com  Thu Aug  1 02:37:24 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Wed, 31 Jul 2013 20:37:24 -0400
Subject: [Koha-patches] [PATCH] Bug 10671: Help files for course reserves
Message-ID: <1375317444-3030-1-git-send-email-nengard@bywatersolutions.com>

This patch adds the missing help files for course reserves.

To test:

* visit every page related to course reserves in the staff client
* click help in the top right
* review the help file for typos/content/links
---
 .../en/modules/help/course_reserves/add_items.tt   |   15 ++++++++++++++
 .../modules/help/course_reserves/course-details.tt |   11 ++++++++++
 .../prog/en/modules/help/course_reserves/course.tt |   19 ++++++++++++++++++
 .../help/course_reserves/course_reserves.tt        |   21 ++++++++++++++++++++
 4 files changed, 66 insertions(+), 0 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/add_items.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/course-details.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/course.tt
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/course_reserves.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/add_items.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/add_items.tt
new file mode 100644
index 0000000..776eb0c
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/add_items.tt
@@ -0,0 +1,15 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Add/edit course items</h1>
+
+<p>Before adding reserve materials you will need at least one course to add them to. To add materials visit the Course Reserves module.</p>
+
+<p>Click on the title of the course you would like to add materials to.</p>
+
+<p>At the top of the course description click the 'Add reserves' button to add titles to this reserve list. You will be asked to enter the barcode for the reserve item.</p>
+
+<p>After you are done scanning the barcodes to add to the course you can see them on the course page.</p>
+
+<p><strong>See the full documentation for adding items to Course reserves in the <a href="http://manual.koha-community.org/3.14/en/addreserves.html">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/course-details.tt
new file mode 100644
index 0000000..23dfca0
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/course-details.tt
@@ -0,0 +1,11 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Course details</h1>
+
+<p>The course reserves module in Koha allows you to temporarily move items to 'reserve' and assign different circulation rules to these items while they are being used for a specific course.</p>
+
+<p>The details page will show you the items you have on reserve for your course. From here you can add/remove items and edit the course.</p>
+
+<p><strong>See the full documentation for Course reserves in the <a href="http://manual.koha-community.org/3.14/en/coursereserves.html">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/course.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/course.tt
new file mode 100644
index 0000000..e5ff376
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/course.tt
@@ -0,0 +1,19 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Add/edit a course</h1>
+
+<p>Once you have completed your set up for Course Reserves you can start creating courses and adding titles to the reserve list.</p>
+
+<p>From the main course reserves page you can add a new course by clicking the 'New course' button at the top left.</p>
+
+<p>Your new course will need a Department, Number and Name at the bare minimum. You can also add in additional details like course section number and term. To link a instructor to this course simply start typing their name and Koha will search your patron database to find you the right person.</p>
+
+<p>Once the instructor you want appears just click their name and they will be added. You can repeat this for all instructors on this course. Each instructor will appear above the search box and can be removed by clicking the 'Remove' link to the right of their name.</p>
+
+<p>If you would like your course to show publicly you'll want to be sure to check the 'Enabled?' box before saving your new course.</p>
+
+<p>Once your course is saved it will show on the main course reserves page and be searchable by any field in the course.</p>
+
+<p><strong>See the full documentation for adding Course reserves in the <a href="http://manual.koha-community.org/3.14/en/addingcourses.html">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/course_reserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/course_reserves.tt
new file mode 100644
index 0000000..9e8ab1c
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/course_reserves/course_reserves.tt
@@ -0,0 +1,21 @@
+[% INCLUDE 'help-top.inc' %]
+
+<h1>Course reserves</h1>
+
+<p>The course reserves module in Koha allows you to temporarily move items to 'reserve' and assign different circulation rules to these items while they are being used for a specific course.</p>
+
+<h2>Course Reserves Setup</h2>
+
+<p>Before using Course Reserves you will need to do some set up.</p>
+
+<p>First you will need to enable course reserves by setting the UseCourseReserves preference to 'Use'.</p>
+
+<p>Next you will need to have all of your course instructors added as patrons.</p>
+
+<p>Next you will want to add a couple of new authorized values for Departments and Terms.</p>
+
+<p>You may also want to create new item types, collection codes and/or shelving locations to make it clear that the items are on reserve to your patrons. You will also want to be sure to confirm that your circulation and fine rules are right for your new item types (whether they be hourly or daily loans).</p>
+
+<p><strong>See the full documentation for Course reserves in the <a href="http://manual.koha-community.org/3.14/en/coursereserves.html">manual</a> (online).</strong></p>
+
+[% INCLUDE 'help-bottom.inc' %]
-- 
1.7.2.3


From oleonard at myacpl.org  Thu Aug  1 15:23:10 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  1 Aug 2013 09:23:10 -0400
Subject: [Koha-patches] [PATCH] Bug 10656 - shelving locations not alpha on
	search
Message-ID: <1375363390-3539-1-git-send-email-oleonard@myacpl.org>

Collection codes and shelving locations are displayed in the OPAC and
staff client via GetAuthorisedValues which currently sorts results by
"lib, lib_opac." Consequently if lib (the description for the staff
client) doesn't match lib_opac (the description for the OPAC) sorting
will appear to be nonsensical in the OPAC. GetAuthorisedValues can be
passed an $opac parameter, so this should be used to switch how reuslts
are sorted. This patch implements such a switch.

To test, modify your collection code or shelving location authorized
values so that lib and lib_opac do not match. Set your
AdvancedSearchTypes system preference to display the modified authorized
values and view the advanced search page in the OPAC and staff client.
Sorting should be correct in each case according to the correct value
(lib in the staff client, lib_opac in the OPAC).
---
 C4/Koha.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index ea8c2a6..1317006 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -1076,7 +1076,7 @@ sub GetAuthorisedValues {
     if(@where_strings > 0) {
         $query .= " WHERE " . join(" AND ", @where_strings);
     }
-    $query .= " GROUP BY lib ORDER BY category, lib, lib_opac";
+    $query .= " GROUP BY lib ORDER BY category, " . ($opac ? "lib_opac, lib" : "lib, lib_opac");
 
     my $sth = $dbh->prepare($query);
 
-- 
1.7.9.5

From oleonard at myacpl.org  Thu Aug  1 16:14:04 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  1 Aug 2013 10:14:04 -0400
Subject: [Koha-patches] [PATCH] Bug 10619 - sco.css missing for CCSR OPAC
	templates
Message-ID: <1375366444-4416-1-git-send-email-oleonard@myacpl.org>

sco.css is not missing from CCSR, but some image paths in the CSS are
incorrect, resulting in some missing images. This patch corrects those
broken paths.

This patch also hides the Cart/Lists/login region of the template which
should not be visible in self checkout.

To test, enable self-checkout and switch to the CCSR theme. Load a
patron for self-checkout and confirm that images associated with buttons
appear correctly: By the help link in the upper-right, on the 'Finish'
button, etc. Try checking out an item which is already checked out to
that patron to see more examples.
---
 koha-tmpl/opac-tmpl/ccsr/en/css/sco.css |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/sco.css b/koha-tmpl/opac-tmpl/ccsr/en/css/sco.css
index 5a79a47..d065fc6 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/css/sco.css
+++ b/koha-tmpl/opac-tmpl/ccsr/en/css/sco.css
@@ -140,27 +140,27 @@ div.message {
 
 
 .dialog input.back {
-	background : #FFF url(../../famfamfam/silk/arrow_left.png) no-repeat 4px center;
+    background : #FFF url(/opac-tmpl/lib/famfamfam/silk/arrow_left.png) no-repeat 4px center;
     padding : .4em .4em .4em 25px;
  }
 
 .dialog input.return {
-	background : #FFF url(../../famfamfam/silk/book_previous.png) no-repeat 4px center;
+    background : #FFF url(/opac-tmpl/lib/famfamfam/silk/book_previous.png) no-repeat 4px center;
  padding : .4em .4em .4em 25px;
  }
 
 .dialog input.renew {
-	background : #FFF url(../../famfamfam/silk/arrow_refresh.png) no-repeat 4px center;
+    background : #FFF url(/opac-tmpl/lib/famfamfam/silk/arrow_refresh.png) no-repeat 4px center;
   padding : .4em .4em .4em 25px;
  }
 
 .dialog input.cancel {
-	background : #FFF url(../../famfamfam/silk/cancel.png) no-repeat 4px center;
+    background : #FFF url(/opac-tmpl/lib/famfamfam/silk/cancel.png) no-repeat 4px center;
         padding : .4em .4em .4em 25px;
  }
 
 input.finish {
-      background : #dbe7ff url(../../famfamfam/silk/stop.png) no-repeat 4px center;
+      background : #dbe7ff url(/opac-tmpl/lib/famfamfam/silk/stop.png) no-repeat 4px center;
   border : 1px outset #666;
       padding : .2em .2em .2em 25px;
 }
@@ -234,7 +234,7 @@ input.focus {
        border : 2px inset #336699;
 }
 #checkouthelp {
-  background : #FFF url("../../famfamfam/silk/help.png") no-repeat 4px center;
+  background : #FFF url("/opac-tmpl/lib/famfamfam/silk/help.png") no-repeat 4px center;
    padding : 3px 3px 3px 26px;
     position : absolute;
    top : 0;
@@ -249,7 +249,7 @@ div.button a:link,
 div.button a:visited,
 div.button a:hover,
 div.button a:active {
-	background : #FFF url(../../famfamfam/silk/book_previous.png) no-repeat 4px center;
+    background : #FFF url(/opac-tmpl/lib/famfamfam/silk/book_previous.png) no-repeat 4px center;
     border : 1px outset #666;
       color : #000;
   padding : .4em .4em .4em 25px;
@@ -339,3 +339,7 @@ span.lang{
 div.ft {
  clear : both;
 }
+#top-bar,
+#main_footer {
+    display: none;
+}
\ No newline at end of file
-- 
1.7.9.5

From oleonard at myacpl.org  Thu Aug  1 17:03:30 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  1 Aug 2013 11:03:30 -0400
Subject: [Koha-patches] [PATCH] Bug 10672 - Add subtitle to display of
	checkouts, overdues, and holds on the patron summary
Message-ID: <1375369410-5217-1-git-send-email-oleonard@myacpl.org>

In the OPAC, the patron summary page (opac-user.pl) should display
subtitle along with title in the lists of checkouts, overdues, and
holds. This patch adds it.

To test, log in to the OPAC as a patron who has checkouts, overdues, and
holds which include titles with subtitles. Titles should appear
correctly with and without subtitles.
---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt |    6 +++---
 opac/opac-user.pl                                |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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 d7c691f..f75c82c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -179,7 +179,7 @@ $.tablesorter.addParser({
 
 </td>[% END %]
 
-                <td class="title"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %]</a><span class="item-details">
+                <td class="title"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %][% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %]</a><span class="item-details">
                         [% ISSUE.author %]
                     </span></td>
                 [% IF ( ISSUE.overdue ) %]
@@ -325,7 +325,7 @@ $.tablesorter.addParser({
 [% END %]
 </td>[% END %]
 
-<td><a href="/cgi-bin/koha/opac-detail.pl?bib=[% OVERDUE.biblionumber %]">[% OVERDUE.title |html %]</a> <span class="item-details">[% OVERDUE.author %]</span></td>
+<td><a href="/cgi-bin/koha/opac-detail.pl?bib=[% OVERDUE.biblionumber %]">[% OVERDUE.title |html %][% FOREACH subtitl IN OVERDUE.subtitle %] [% subtitl.subfield %][% END %]</a> <span class="item-details">[% OVERDUE.author %]</span></td>
 
 [% UNLESS ( item_level_itypes ) %]<td>[% IF ( OVERDUE.imageurl ) %]<img src="[% OVERDUE.imageurl %]" title="[% OVERDUE.description %]" alt="[% OVERDUE.description %]" />[% END %] [% OVERDUE.description %]</td>[% END %]
 [% IF ( show_barcode ) %]<td>[% OVERDUE.barcode %]</td>[% END %]
@@ -381,7 +381,7 @@ $.tablesorter.addParser({
                     [% ELSE %]
                             <tr>
                     [% END %]
-                <td class="title"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RESERVE.biblionumber %]">[% RESERVE.reserves_title %]</a>
+                <td class="title"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RESERVE.biblionumber %]">[% RESERVE.reserves_title %][% FOREACH subtitl IN RESERVE.subtitle %] [% subtitl.subfield %][% END %]</a>
                     [% RESERVE.author %]
                 </td>
                 <td class="reservedate">[% RESERVE.reservedate | $KohaDates %]</td>
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 5c01ae2..731caf8 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -176,7 +176,7 @@ if ($issues){
             }
         }
         $issue->{'charges'} = $charges;
-
+        $issue->{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($issue->{'biblionumber'}), GetFrameworkCode($issue->{'biblionumber'}));
         # check if item is renewable
         my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
         ($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
@@ -256,7 +256,7 @@ foreach my $res (@reserves) {
     if ( $res->{'expirationdate'} eq '0000-00-00' ) {
       $res->{'expirationdate'} = '';
     }
-
+    $res->{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($res->{'biblionumber'}), GetFrameworkCode($res->{'biblionumber'}));
     $res->{'waiting'} = 1 if $res->{'found'} eq 'W';
     $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
     my $biblioData = GetBiblioData($res->{'biblionumber'});
-- 
1.7.9.5

From oleonard at myacpl.org  Thu Aug  1 20:46:12 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  1 Aug 2013 14:46:12 -0400
Subject: [Koha-patches] [PATCH 4/4] Bug 10402 [Template follow-up] Add
	multiple contacts for vendors
Message-ID: <1375382772-7712-1-git-send-email-oleonard@myacpl.org>

This template-only follow-up tweaks the button labels and restructures
the vendor view layout a little bit to make it more amenable to multiple
contacts:

- Add spaces after button icons
- Change "Add contact" to "Add another contact" in hopes of making it
  less ambiguous whether clicking it will submit the whole form.
- Eliminate duplicate headers on the vendor view page by making the
  contact name the subheading for each individual contact.

To test, view details for vendors with one or more contacts, and try
editing to add additional contacts. Everything should look good and work
correctly.
---
 .../prog/en/modules/acqui/supplier.tt              |   76 +++++++++++---------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
index fcbaea4..7b92b6f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
@@ -16,11 +16,12 @@
             <input type="text" size="40" id="contact_email[% contact.id %]" name="contact_email" value="[% contact.email %]" /></li>
         <li><label for="contact_notes[% contact.id %]">Notes: </label>
             <textarea id="contact_notes[% contact.id %]" name="contact_notes" cols="40" rows="4">[% contnotes %]</textarea></li>
-        [% IF contact.id %]<li><button class="btn" class="delete-contact"><i class="icon-remove"></i>Delete contact</li>[% END %]
+        [% IF contact.id %]<li><button class="btn" class="delete-contact"><i class="icon-remove"></i> Delete contact</li>[% END %]
     </ol>
 [% END %]
+
 [% BLOCK show_contact %]
-    <p><span class="label">Contact name: </span>[% contact.name %]</p>
+    <h3>[% contact.name %]</h3>
     <p><span class="label">Position: </span>[% contact.position %]</p>
     <p><span class="label">Phone: </span>[% contact.phone %]</p>
     <p><span class="label">Alternative phone: </span>[% contact.altphone %]</p>
@@ -32,6 +33,7 @@
         <p><span class="label">Notes: </span>[% contact.notes %]</p>
     [% END %]
 [% END %]
+
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Vendor [% bookselname %]</title>
 <link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
@@ -149,7 +151,7 @@ function delete_contact() {
                     [% INCLUDE edit_contact %]
                 </fieldset>
             [% END %]
-            <button id="add-contact" class="btn"><i class="icon-plus"></i>Add contact</button>
+            <button id="add-contact" class="btn"><i class="icon-plus"></i> Add another contact</button>
         </fieldset>
     </div>
         <div class="yui-g">
@@ -259,41 +261,45 @@ function delete_contact() {
                 [% IF ( accountnumber ) %]
                     <p><span class="label">Account number: </span>[% accountnumber %]</p>
                 [% END %]
+
+            <div id="supplier-ordering-information">
+            <h2>Ordering information</h2>
+                <p><strong>Vendor is: </strong>
+                        [% IF ( active ) %]
+                            Active
+                        [% ELSE %]
+                            Inactive
+                        [% END %]</p>
+                <p><strong>List prices are: </strong>[% listprice %]</p>
+                <p><strong>Invoice prices are: </strong>[% invoiceprice %]</p>
+                [% IF ( gstrate ) %]<p><strong>Tax number registered: </strong>
+                        [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]</p>
+                <p><strong>List item price includes tax: </strong>
+                        [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]</p>
+                <p><strong>Invoice item price includes tax: </strong>
+                        [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %]
+                <p><strong>Discount: </strong>
+                    [% discount | format("%.1f") %] %</p>
+                <p><strong>Tax rate: </strong>
+                    [% 0 + gstrate * 100 | format("%.1f") %] %</p>
+                [% IF deliverytime.defined %]
+                    <p><strong>Delivery time: </strong>
+                        [% deliverytime %] days</p>
+                [% END %]
+                [% IF ( notes ) %]<p><strong>Notes: </strong>
+                    [% notes %]</p>[% END %]
             </div>
-            [% FOREACH contact IN contacts %]
-                <div class="supplier-contact-details yui-u">
-                    <h2>Contact details</h2>
+            </div>
+
+            <div class="supplier-contact-details yui-u">
+                <h2>Contact</h2>
+                [% FOREACH contact IN contacts %]
                     [% INCLUDE show_contact %]
-                </div>
-            [% END %]
-        </div>
-        <div id="supplier-ordering-information" class="yui-g">
-        <h3>Ordering information</h3>
-            <p><strong>Vendor is: </strong>
-                    [% IF ( active ) %]
-                        Active
-                    [% ELSE %]
-                        Inactive
-                    [% END %]</p>
-            <p><strong>List prices are: </strong>[% listprice %]</p>
-            <p><strong>Invoice prices are: </strong>[% invoiceprice %]</p>
-            [% IF ( gstrate ) %]<p><strong>Tax number registered: </strong>
-                    [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]</p>
-            <p><strong>List item price includes tax: </strong>
-                    [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]</p>
-            <p><strong>Invoice item price includes tax: </strong>
-                    [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %]
-            <p><strong>Discount: </strong>
-                [% discount | format("%.1f") %] %</p>
-            <p><strong>Tax rate: </strong>
-                [% 0 + gstrate * 100 | format("%.1f") %] %</p>
-            [% IF deliverytime.defined %]
-                <p><strong>Delivery time: </strong>
-                    [% deliverytime %] days</p>
-            [% END %]
-            [% IF ( notes ) %]<p><strong>Notes: </strong>
-                [% notes %]</p>[% END %]
+                [% END %]
+            </div>
+
         </div>
+
         [% IF ( contracts ) %]
             <div id="supplier-contracts" class="yui-g">
                 <h2>Contract(s)</h2>
-- 
1.7.9.5


From oleonard at myacpl.org  Thu Aug  1 21:54:52 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  1 Aug 2013 15:54:52 -0400
Subject: [Koha-patches] [PATCH] Bug 10493 [Template follow-up] Add renewal
	script
Message-ID: <1375386893-9061-1-git-send-email-oleonard@myacpl.org>

This template followup fixes some minor template errors and adds some
style to dialog buttons matching those seen on the circulation page.

To test, submit barcodes to trigger the various error conditions:
Non-existant barcode, over the renew limit, restricted patron, item on
hold. Override and Ignore buttons should be properly styled and
functional.
---
 .../intranet-tmpl/prog/en/modules/circ/renew.tt    |   49 +++++++-------------
 1 file changed, 16 insertions(+), 33 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
index eba8892..fe090b5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt
@@ -8,16 +8,6 @@
 
 [% INCLUDE 'doc-head-close.inc' %]
 
-<script type="text/javascript">
-//<![CDATA[
-
-$(document).ready(function () {
-    $("#barcode").focus();
-});
-
-//]]>
-</script>
-
 </head>
 
 <body>
@@ -25,56 +15,49 @@ $(document).ready(function () {
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'circ-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Check in</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a> &rsaquo; Renew</div>
 
 <div id="doc" class="yui-t7">
     <div id="bd">
-            <div id="yui-main">
 
-            <div class="yui-g">
                 [% IF error %]
                     <div class="dialog alert">
                         <h3>Cannot renew:</h3>
-                        <p>
+
                             [% IF error == "no_item" %]
 
-                                No item matches this barcode
+                                <p>No item matches this barcode</p>
 
                             [% ELSIF error == "no_checkout" %]
 
-                                <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber %]">[% item.biblio.title %] [% item.biblioitem.subtitle %]</a>
-                                ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber %]&biblionumber=[% item.biblionumber %]&bi=[% item.biblioitemnumber %]#item[% item.itemnumber %]">[% item.barcode %]</a> )
-                                is not checked out to a patron.
+                                <p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber %]">[% item.biblio.title %] [% item.biblioitem.subtitle %]</a> ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber %]&amp;biblionumber=[% item.biblionumber %]&amp;bi=[% item.biblioitemnumber %]#item[% item.itemnumber %]">[% item.barcode %]</a> ) is not checked out to a patron.</p>
 
                             [% ELSIF error == "too_many" %]
 
-                                [% item.biblio.title %] [% item.biblioitem.subtitle %] ( [% item.barcode %] )
-                                has been renewed the maximum number of times by
-                                [% borrower.firstname %] [% borrower.surname %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]"> [% borrower.cardnumber %] </a> )
+                                <p>[% item.biblio.title %] [% item.biblioitem.subtitle %] ( [% item.barcode %] ) has been renewed the maximum number of times by [% borrower.firstname %] [% borrower.surname %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]"> [% borrower.cardnumber %] </a> )</p>
 
                                 [% IF Koha.Preference('AllowRenewalLimitOverride') %]
-                                    <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off" >
+                                    <form method="post" action="/cgi-bin/koha/circ/renew.pl">
                                         <input type="hidden" name="barcode" value="[% item.barcode %]"/>
                                         <input type="hidden" name="override_limit" value="1" />
-                                        <input type="submit" class="submit" value="Override limit and renew" />
+                                        <input type="submit" class="approve" value="Override limit and renew" />
                                     </form>
                                 [% END %]
 
                             [% ELSIF error == "on_reserve" %]
 
-                                This item is on hold for other patrons.
+                                <p>This item is on hold for another patron.</p>
 
-                                <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off" >
+                                <form method="post" action="/cgi-bin/koha/circ/renew.pl">
                                     <input type="hidden" name="barcode" value="[% item.barcode %]"/>
                                     <input type="hidden" name="override_limit" value="1" />
                                     <input type="hidden" name="override_holds" value="1" />
-                                    <input type="submit" class="submit" value="Override and renew" />
+                                    <input type="submit" class="approve" value="Override and renew" />
                                 </form>
 
                             [% ELSIF error == "patron_restricted" %]
 
-                                [% borrower.firstname %] [% borrower.surname %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]"> [% borrower.cardnumber %] </a> )
-                                is currently restricted.
+                                <p>[% borrower.firstname %] [% borrower.surname %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]"> [% borrower.cardnumber %] </a> ) is currently restricted.</p>
 
                             [% ELSE %]
 
@@ -82,18 +65,18 @@ $(document).ready(function () {
 
                             [% END %]
 
-                            <a href="/cgi-bin/koha/circ/renew.pl">Ignore & continue</a>
-                        </p>
+                                <form method="get" action="/cgi-bin/koha/circ/renew.pl">
+                                    <input type="submit" class="deny" value="Ignore and continue" />
+                                </form>
                     </div>
                 [% END %]
 
                 [% IF date_due %]
                     <div class="dialog message">
+                        <h3>Item renewed:</h3>
                         <p>
-                            <h3>Item renewed:</h3>
-
                             <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% item.biblionumber %]">[% item.biblio.title %] [% item.biblioitem.subtitle %]</a>
-                            ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber %]&biblionumber=[% item.biblionumber %]&bi=[% item.biblioitemnumber %]#item[% item.itemnumber %]">[% item.barcode %]</a> )
+                            ( <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% item.itemnumber %]&amp;biblionumber=[% item.biblionumber %]&amp;bi=[% item.biblioitemnumber %]#item[% item.itemnumber %]">[% item.barcode %]</a> )
                             renewed for
                             [% borrower.firstname %] [% borrower.surname %] ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrower.borrowernumber %]"> [% borrower.cardnumber %] </a> )
                             now due on [% date_due | $KohaDates %]
-- 
1.7.9.5

From srdjan at catalyst.net.nz  Fri Aug  2 01:53:32 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Fri,  2 Aug 2013 11:53:32 +1200
Subject: [Koha-patches] [PATCH] Bug 10628 - AutomaticItemReturn prevents
	holds queue from filling local holds with local items
Message-ID: <1375401212-27223-1-git-send-email-srdjan@catalyst.net.nz>

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

For some reason, C4::HoldsQueue::MapItemsToHoldRequests uses the system
preference AutomaticItemReturn to decide if an attempt to fill local
holds with local items. No explanation of this behavior is provided.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/HoldsQueue.pm            | 13 ++++++++-----
 t/db_dependent/HoldsQueue.t | 11 +++++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm
index 2052f09..eff3148 100755
--- a/C4/HoldsQueue.pm
+++ b/C4/HoldsQueue.pm
@@ -32,6 +32,7 @@ use C4::Biblio;
 use C4::Dates qw/format_date/;
 
 use List::Util qw(shuffle);
+use List::MoreUtils qw(any);
 use Data::Dumper;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
@@ -354,8 +355,6 @@ sub MapItemsToHoldRequests {
     return unless scalar(@$hold_requests) > 0;
     return unless scalar(@$available_items) > 0;
 
-    my $automatic_return = C4::Context->preference("AutomaticItemReturn");
-
     # identify item-level requests
     my %specific_items_requested = map { $_->{itemnumber} => 1 }
                                    grep { defined($_->{itemnumber}) }
@@ -419,7 +418,7 @@ sub MapItemsToHoldRequests {
         my $pickup_branch = $request->{branchcode} || $request->{borrowerbranch};
         my ($itemnumber, $holdingbranch);
 
-        my $holding_branch_items = $automatic_return ? undef : $items_by_branch{$pickup_branch};
+        my $holding_branch_items = $items_by_branch{$pickup_branch};
         if ( $holding_branch_items ) {
             foreach my $item (@$holding_branch_items) {
                 if ( $request->{borrowerbranch} eq $item->{homebranch} ) {
@@ -587,10 +586,14 @@ sub least_cost_branch {
     #$from - arrayref
     my ($to, $from, $transport_cost_matrix) = @_;
 
-# Nothing really spectacular: supply to branch, a list of potential from branches
-# and find the minimum from - to value from the transport_cost_matrix
+    # Nothing really spectacular: supply to branch, a list of potential from branches
+    # and find the minimum from - to value from the transport_cost_matrix
     return $from->[0] if @$from == 1;
 
+    # If the pickup library is in the list of libraries to pull from,
+    # return that library right away, it is obviously the least costly
+    return ($to) if any { $_ eq $to } @$from;
+
     my ($least_cost, @branch);
     foreach (@$from) {
         my $cell = $transport_cost_matrix->{$to}{$_};
diff --git a/t/db_dependent/HoldsQueue.t b/t/db_dependent/HoldsQueue.t
index 8de2583..5c4c74b 100755
--- a/t/db_dependent/HoldsQueue.t
+++ b/t/db_dependent/HoldsQueue.t
@@ -12,7 +12,7 @@ use C4::Context;
 
 use Data::Dumper;
 
-use Test::More tests => 18;
+use Test::More tests => 16;
 
 use C4::Branch;
 use C4::ItemType;
@@ -100,7 +100,7 @@ my $priority = 1;
 # Make a reserve
 AddReserve ( $borrower_branchcode, $borrowernumber, $biblionumber, $constraint, $bibitems,  $priority );
 #                           $resdate, $expdate, $notes, $title, $checkitem, $found
-$dbh->do("UPDATE reserves SET reservedate = reservedate - 1");
+$dbh->do("UPDATE reserves SET reservedate = DATE_SUB( reservedate, INTERVAL 1 DAY )");
 
 # Tests
 my $use_cost_matrix_sth = $dbh->prepare("UPDATE systempreferences SET value = ? WHERE variable = 'UseTransportCostMatrix'");
@@ -121,8 +121,6 @@ $dbh->do("DELETE FROM items WHERE homebranch = '$borrower_branchcode' AND holdin
 # test_queue will flush
 C4::Context->set_preference('AutomaticItemReturn', 1);
 # Not sure how to make this test more difficult - holding branch does not matter
-test_queue ('take from holdingbranch AutomaticItemReturn on', 0, $borrower_branchcode, undef);
-test_queue ('take from holdingbranch AutomaticItemReturn on', 1, $borrower_branchcode, $least_cost_branch_code);
 
 $dbh->do("DELETE FROM tmp_holdsqueue");
 $dbh->do("DELETE FROM hold_fill_targets");
@@ -148,6 +146,11 @@ ok( $queue_item
  && $queue_item->{holdingbranch} eq $least_cost_branch_code, "GetHoldsQueueItems" )
   or diag( "Expected item for pick $borrower_branchcode, hold $least_cost_branch_code, got ".Dumper($queue_item) );
 
+ok(
+    C4::HoldsQueue::least_cost_branch( 'B', [ 'A', 'B', 'C' ] ) eq 'B',
+    'C4::HoldsQueue::least_cost_branch returns the local branch if it is in the list of branches to pull from'
+);
+
 # XXX All this tests are for borrower branch pick-up.
 # Maybe needs expanding to homebranch or holdingbranch pick-up.
 
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Fri Aug  2 04:48:17 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Fri,  2 Aug 2013 14:48:17 +1200
Subject: [Koha-patches] [PATCH] Bug 10672 - Add subtitle to display of
	checkouts, overdues, and holds on the patron summary
Message-ID: <1375411697-13749-1-git-send-email-srdjan@catalyst.net.nz>

From: Owen Leonard <oleonard at myacpl.org>

In the OPAC, the patron summary page (opac-user.pl) should display
subtitle along with title in the lists of checkouts, overdues, and
holds. This patch adds it.

To test, log in to the OPAC as a patron who has checkouts, overdues, and
holds which include titles with subtitles. Titles should appear
correctly with and without subtitles.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 6 +++---
 opac/opac-user.pl                                | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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 d7c691f..f75c82c 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt
@@ -179,7 +179,7 @@ $.tablesorter.addParser({
 
 </td>[% END %]
 
-                <td class="title"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %]</a><span class="item-details">
+                <td class="title"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% ISSUE.biblionumber %]">[% ISSUE.title |html %][% FOREACH subtitl IN ISSUE.subtitle %] [% subtitl.subfield %][% END %]</a><span class="item-details">
                         [% ISSUE.author %]
                     </span></td>
                 [% IF ( ISSUE.overdue ) %]
@@ -325,7 +325,7 @@ $.tablesorter.addParser({
 [% END %]
 </td>[% END %]
 
-<td><a href="/cgi-bin/koha/opac-detail.pl?bib=[% OVERDUE.biblionumber %]">[% OVERDUE.title |html %]</a> <span class="item-details">[% OVERDUE.author %]</span></td>
+<td><a href="/cgi-bin/koha/opac-detail.pl?bib=[% OVERDUE.biblionumber %]">[% OVERDUE.title |html %][% FOREACH subtitl IN OVERDUE.subtitle %] [% subtitl.subfield %][% END %]</a> <span class="item-details">[% OVERDUE.author %]</span></td>
 
 [% UNLESS ( item_level_itypes ) %]<td>[% IF ( OVERDUE.imageurl ) %]<img src="[% OVERDUE.imageurl %]" title="[% OVERDUE.description %]" alt="[% OVERDUE.description %]" />[% END %] [% OVERDUE.description %]</td>[% END %]
 [% IF ( show_barcode ) %]<td>[% OVERDUE.barcode %]</td>[% END %]
@@ -381,7 +381,7 @@ $.tablesorter.addParser({
                     [% ELSE %]
                             <tr>
                     [% END %]
-                <td class="title"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RESERVE.biblionumber %]">[% RESERVE.reserves_title %]</a>
+                <td class="title"><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% RESERVE.biblionumber %]">[% RESERVE.reserves_title %][% FOREACH subtitl IN RESERVE.subtitle %] [% subtitl.subfield %][% END %]</a>
                     [% RESERVE.author %]
                 </td>
                 <td class="reservedate">[% RESERVE.reservedate | $KohaDates %]</td>
diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 5c01ae2..731caf8 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -176,7 +176,7 @@ if ($issues){
             }
         }
         $issue->{'charges'} = $charges;
-
+        $issue->{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($issue->{'biblionumber'}), GetFrameworkCode($issue->{'biblionumber'}));
         # check if item is renewable
         my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
         ($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
@@ -256,7 +256,7 @@ foreach my $res (@reserves) {
     if ( $res->{'expirationdate'} eq '0000-00-00' ) {
       $res->{'expirationdate'} = '';
     }
-
+    $res->{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($res->{'biblionumber'}), GetFrameworkCode($res->{'biblionumber'}));
     $res->{'waiting'} = 1 if $res->{'found'} eq 'W';
     $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
     my $biblioData = GetBiblioData($res->{'biblionumber'});
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Fri Aug  2 05:25:24 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Fri,  2 Aug 2013 15:25:24 +1200
Subject: [Koha-patches] [PATCH] Bug 10619 - sco.css missing for CCSR OPAC
	templates
Message-ID: <1375413924-17717-1-git-send-email-srdjan@catalyst.net.nz>

From: Owen Leonard <oleonard at myacpl.org>

sco.css is not missing from CCSR, but some image paths in the CSS are
incorrect, resulting in some missing images. This patch corrects those
broken paths.

This patch also hides the Cart/Lists/login region of the template which
should not be visible in self checkout.

To test, enable self-checkout and switch to the CCSR theme. Load a
patron for self-checkout and confirm that images associated with buttons
appear correctly: By the help link in the upper-right, on the 'Finish'
button, etc. Try checking out an item which is already checked out to
that patron to see more examples.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 koha-tmpl/opac-tmpl/ccsr/en/css/sco.css | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/ccsr/en/css/sco.css b/koha-tmpl/opac-tmpl/ccsr/en/css/sco.css
index 5a79a47..d065fc6 100644
--- a/koha-tmpl/opac-tmpl/ccsr/en/css/sco.css
+++ b/koha-tmpl/opac-tmpl/ccsr/en/css/sco.css
@@ -140,27 +140,27 @@ div.message {
 
 
 .dialog input.back {
-	background : #FFF url(../../famfamfam/silk/arrow_left.png) no-repeat 4px center;
+    background : #FFF url(/opac-tmpl/lib/famfamfam/silk/arrow_left.png) no-repeat 4px center;
     padding : .4em .4em .4em 25px;
  }
 
 .dialog input.return {
-	background : #FFF url(../../famfamfam/silk/book_previous.png) no-repeat 4px center;
+    background : #FFF url(/opac-tmpl/lib/famfamfam/silk/book_previous.png) no-repeat 4px center;
  padding : .4em .4em .4em 25px;
  }
 
 .dialog input.renew {
-	background : #FFF url(../../famfamfam/silk/arrow_refresh.png) no-repeat 4px center;
+    background : #FFF url(/opac-tmpl/lib/famfamfam/silk/arrow_refresh.png) no-repeat 4px center;
   padding : .4em .4em .4em 25px;
  }
 
 .dialog input.cancel {
-	background : #FFF url(../../famfamfam/silk/cancel.png) no-repeat 4px center;
+    background : #FFF url(/opac-tmpl/lib/famfamfam/silk/cancel.png) no-repeat 4px center;
         padding : .4em .4em .4em 25px;
  }
 
 input.finish {
-      background : #dbe7ff url(../../famfamfam/silk/stop.png) no-repeat 4px center;
+      background : #dbe7ff url(/opac-tmpl/lib/famfamfam/silk/stop.png) no-repeat 4px center;
   border : 1px outset #666;
       padding : .2em .2em .2em 25px;
 }
@@ -234,7 +234,7 @@ input.focus {
        border : 2px inset #336699;
 }
 #checkouthelp {
-  background : #FFF url("../../famfamfam/silk/help.png") no-repeat 4px center;
+  background : #FFF url("/opac-tmpl/lib/famfamfam/silk/help.png") no-repeat 4px center;
    padding : 3px 3px 3px 26px;
     position : absolute;
    top : 0;
@@ -249,7 +249,7 @@ div.button a:link,
 div.button a:visited,
 div.button a:hover,
 div.button a:active {
-	background : #FFF url(../../famfamfam/silk/book_previous.png) no-repeat 4px center;
+    background : #FFF url(/opac-tmpl/lib/famfamfam/silk/book_previous.png) no-repeat 4px center;
     border : 1px outset #666;
       color : #000;
   padding : .4em .4em .4em 25px;
@@ -339,3 +339,7 @@ span.lang{
 div.ft {
  clear : both;
 }
+#top-bar,
+#main_footer {
+    display: none;
+}
\ No newline at end of file
-- 
1.8.1.2

From tomascohen at gmail.com  Fri Aug  2 20:39:04 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Fri,  2 Aug 2013 15:39:04 -0300
Subject: [Koha-patches] [PATCH] Bug 10678 - Allow framework selection when
	creating from Z39.50
Message-ID: <1375468744-18906-1-git-send-email-tomascohen@gmail.com>

If we are creating a new record, we are forced to use the default framework
and then change it after we have the cataloguing form filled. This patch
adds the option to choose (from a splitted button dropdown) which framework
to use.

To test:
- Apply the patch.
- Go to More > Cataloguing
- Check there's a nice split button that says "New from Z39.50"
a) Click the button, the usual Z39.50 search popup should appear and work as expected
   (check the URL parameters and see frameworkcode= has no value
b) Click on the dropdown arrow, choose a framework and the usual Z39.50 search popup should
   appear, this time frameworkcode= should have the chosen value.

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 .../prog/en/modules/cataloguing/addbooks.tt        | 26 +++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
index 9155235..6de5e51 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -10,18 +10,23 @@
             PopupZ3950();
             return false;
         });
+
+        $(".z3950searchFw").click(function(){
+            PopupZ3950($(this).prop('id'));
+            return false;
+        });
      });
 
     /* this function open a popup to search on z3950 server.  */
-    function PopupZ3950() {
-        var strQuery = GetZ3950Terms();
+    function PopupZ3950(fw) {
+        var strQuery = GetZ3950Terms(fw);
         if(strQuery){
             window.open("/cgi-bin/koha/cataloguing/z3950_search.pl?biblionumber=[% biblionumber %]"+strQuery,"z3950search",'width=760,height=450,location=yes,toolbar=no,scrollbars=yes,resize=yes');
         }
     }
     /* provide Z3950 search points */
-    function GetZ3950Terms(){
-        var strQuery="&frameworkcode=";
+    function GetZ3950Terms(fw){
+        var strQuery="&frameworkcode=" + fw;
         [% FOREACH z3950_search_param IN z3950_search_params %]
             strQuery += "&" + "[% z3950_search_param.name %]" + "=" + "[% z3950_search_param.encvalue %]";
         [% END %]
@@ -52,7 +57,18 @@
                 [% END %]
             </ul>
         </div>
-        <div class="btn-group"><a id="z3950search" class="btn btn-small" href="/cgi-bin/koha/cataloguing/z3950_search.pl?biblionumber=[% biblionumber %]&amp;frameworkcode=[% FOREACH z3950_search_param IN z3950_search_params %]&amp;[% z3950_search_param.name %]=[% z3950_search_param.encvalue %][% END %]"><i class="icon-search"></i> Z39.50 search</a></div>
+        <div class="btn-group">
+            <button class="btn btn-small" id="z3950search"><i class="icon-search"></i> New from Z39.50</button>
+            <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
+                <span class="caret"></span>
+            </button>
+            <ul class="dropdown-menu">
+                <li id="" class="z3950searchFw"><a href="#">Default framework</a></li>
+                [% FOREACH frameworkcodeloo IN frameworkcodeloop %]
+                <li id="[% frameworkcodeloo.value %]" class="z3950searchFw"><a href="#">[% frameworkcodeloo.frameworktext %]</a></li>
+                [% END %]
+            </ul>
+        </div>
   </div>
 [% END %]
 
-- 
1.8.1.2


From oleonard at myacpl.org  Fri Aug  2 20:45:21 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  2 Aug 2013 14:45:21 -0400
Subject: [Koha-patches] [PATCH] Bug 7257 - Add a link to remove an
	individual title from a list
Message-ID: <1375469121-12254-1-git-send-email-oleonard@myacpl.org>

It should be possible when viewing the contents of a list to click a
link to remove an individual title from the list without having to check
a checkbox and click another button.

This patch adds a link to each list item to "Remove from this list."
The functionality is JavaScript-dependent, automatically checking the
appropriate checkbox and submitting the form to delete.

To test, view a list for which you have delete permission. There should
be a "Remove from this list" link next to each item on the list. Test
delete functionality by:

- Clicking the link and then clicking cancel.
- Clicking the link and confirming.
- Checking more than one checkbox and then clicking a single remove
  link (only the one corresponding record should be removed).
- Checking one or more checkboxes and clicking the "Remove from list"
  link at the top of the page.

If JavaScript is disabled the links should not appear.

There are now two delete confirmation messages: One if you're removing
only one item, another if you're removing more than one. This is true
whether you use the links or the checkboxes.
---
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |   14 +++++++++++-
 .../opac-tmpl/prog/en/modules/opac-shelves.tt      |   24 ++++++++++++++++++--
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/css/opac.css b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
index 6fd9a90..f6198d2 100644
--- a/koha-tmpl/opac-tmpl/prog/en/css/opac.css
+++ b/koha-tmpl/opac-tmpl/prog/en/css/opac.css
@@ -779,6 +779,7 @@ a.tag_add {
 	text-decoration : none;
 	padding-left : 33px;
 }
+
 /* Search results place hold link */
 #placehold input.submit {
     background-image: url("../../images/sprite.png"); /* Place hold */
@@ -1491,7 +1492,8 @@ padding-left : .4em;
 .actions a.addtocart,
 .actions a.addtoshelf,
 .actions a.addtolist,
-.actions a.tag_add {
+.actions a.tag_add,
+.actions a.removefromlist {
 	margin-left : 1em;
 	text-decoration : none;
 }
@@ -1513,6 +1515,16 @@ padding-left : .4em;
 	display : none;
 }
 
+/* List contents remove from list link */
+.removefromlist  {
+    background-image : url("../../images/sprite.png"); /* Delete */
+    background-position : -8px -690px;
+    background-repeat: no-repeat;
+    text-decoration : none;
+    padding-left : 15px;
+    display : none;
+}
+
 /* Search results rows save to lists */
 .actions a.addtoshelf {
     background-image : url("../../images/sprite.png"); /* MARC view */
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 c9c0bca..4fe14db 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
@@ -7,6 +7,7 @@
 <script type="text/javascript">
 //<![CDATA[
 var MSG_REMOVE_FROM_LIST = _("Are you sure you want to remove these items from the list?");
+var MSG_REMOVE_ONE_FROM_LIST = _("Are you sure you want to remove this item from the list?");
 var MSG_CONFIRM_DELETE_LIST = _("Are you sure you want to delete this list?");
 
 [% IF ( opacuserlogin ) %][% IF ( RequestOnOpac ) %]
@@ -152,10 +153,24 @@ $(function() {
         });
 [% END %]
   [% IF ( loggedinusername && allowremovingitems ) %]
+  var removeFromListLinks = $(".removefromlist");
+  removeFromListLinks.show();
+  // "remove from list" appearing on each line of the list output
+  removeFromListLinks.on("click",function(){
+      $(".checkboxed").unCheckCheckboxes();
+      var listitem = $("input[name="+this.id+"]");
+      listitem.prop("checked",true);
+      $("#myform").submit();
+  });
   $("#myform").submit(function(){
     var checkedBoxes = $(".checkboxed input:checkbox:checked");
-    if ($(checkedBoxes).size()) {
-      return confirmDelete(MSG_REMOVE_FROM_LIST);
+    var numchecked = $(checkedBoxes).size();
+    if (numchecked) {
+        if( numchecked > 1 ){
+            return confirmDelete(MSG_REMOVE_FROM_LIST);
+        } else {
+            return confirmDelete(MSG_REMOVE_ONE_FROM_LIST);
+        }
     } else {
       alert(MSG_NO_RECORD_SELECTED);
       return false;
@@ -473,6 +488,11 @@ $(document).ready(function() {
 
         [% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( virtualshelves ) %]<a class="addtoshelf" href="/cgi-bin/koha/opac-addbybiblionumber.pl?biblionumber=[% itemsloo.biblionumber %]" onclick="Dopop('opac-addbybiblionumber.pl?biblionumber=[% itemsloo.biblionumber %]'); return false;">Save to another list</a>
           [% END %][% END %][% END %]
+
+        [% IF ( allowremovingitems ) %]
+            <a class="removefromlist" id="REM-[% itemsloo.biblionumber %]" href="#">Remove from this list</a>
+        [% END %]
+
           [% IF ( opacbookbag ) %]
               [% IF ( itemsloo.incart ) %]
                   <a class="addtocart cart[% itemsloo.biblionumber %]" href="#" onclick="addRecord('[% itemsloo.biblionumber %]'); return false;">In your cart</a> <a class="cartRemove cartR[% itemsloo.biblionumber %]" href="#" onclick="delSingleRecord('[% itemsloo.biblionumber %]'); return false;">(remove)</a>
-- 
1.7.9.5

From srdjan at catalyst.net.nz  Mon Aug  5 04:02:59 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon,  5 Aug 2013 14:02:59 +1200
Subject: [Koha-patches] [PATCH] [SIGNED-OFF] Bug 10668 - Improve suggestion
	detail page - QA Followup
Message-ID: <1375668179-5304-1-git-send-email-srdjan@catalyst.net.nz>

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

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 9fd2e67..fc2d438 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -21,12 +21,7 @@
     // <![CDATA[
     $(document).ready(function(){
         $("#deletesuggestion").on("click",function(){
-            var is_confirmed = confirm(_("Are you sure you want to delete this suggestion?"));
-            if (is_confirmed) {
-                return true;
-            } else {
-                return false;
-            }
+            return confirm(_("Are you sure you want to delete this suggestion?"));
         });
     });
     // ]]>
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Mon Aug  5 08:03:38 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon,  5 Aug 2013 18:03:38 +1200
Subject: [Koha-patches] [PATCH] Bug 10588 - opac-topissues first branch
	always selected in filters
Message-ID: <1375682618-31107-1-git-send-email-srdjan@catalyst.net.nz>

From: Fridolyn SOMERS <fridolyn.somers at biblibre.com>

In OPAC most popular items page:
With user is logged-in his branch should be selected.
When a branch is manually selected and form is submitted, this branch should be selected in results page.
When looking at HTML, you see that all options are selected in combobox.

This patch corrects by using the hidden input 'do_it' to distinguish form display and no branch filter selected.

Test plan :
- Make sure there are issues on records created in the past 3 month
- Go to OPAC not logged-in
- Click on "Most popular"
=> You get to page with results, "All libraries" is selected
- Select a branch and submit
=> You get to page with results, the branch is selected [testing opac-topissues.inc from]
- Select a branch and perform a search that does not have results (for example an item type never issued)
=> You get to page without results, the branch is selected [testing opac-topissues.tt form]
- Log-in with a user
- Click on "Most popular"
=> You get to page with results, user's branch is selected
- Select "All libraries" and submit
=> You get to page with results, "All libraries" is selected [testing opac-topissues.inc from]
- Select "All libraries" and perform a search that does not have results (for example an item type never issued)
=> You get to page without results, "All libraries" is selected [testing opac-topissues.tt form]

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc | 2 +-
 opac/opac-topissues.pl                                  | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc b/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc
index 20b1d9b..55501fc 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-topissues.inc
@@ -17,7 +17,7 @@
                 <select name="branch" id="branch" style="width: 10em;">
                 <option value="">All libraries</option>
                 [% FOREACH branchloo IN branchloop %]
-                    [% IF ( branch == branchname ) %]<option value="[% branchloo.value %]" selected="selected">[% ELSE %]<option value="[% branchloo.value %]">[% END %]
+                    [% IF ( branchloo.selected ) %]<option value="[% branchloo.value %]" selected="selected">[% ELSE %]<option value="[% branchloo.value %]">[% END %]
                         [% branchloo.branchname %]
                     </option>
                 [% END %]
diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl
index 95291d0..cdb572a 100755
--- a/opac/opac-topissues.pl
+++ b/opac/opac-topissues.pl
@@ -59,10 +59,14 @@ my ($template, $borrowernumber, $cookie)
 				});
 my $dbh = C4::Context->dbh;
 # Displaying results
+my $do_it = $input->param('do_it') || 0; # as form been posted
 my $limit = $input->param('limit');
 $limit = 10 unless ($limit && $limit =~ /^\d+$/); # control user input for SQL query
 $limit = 100 if $limit > 100;
 my $branch = $input->param('branch') || '';
+if (!$do_it && C4::Context->userenv && C4::Context->userenv->{'branch'} ) {
+    $branch = C4::Context->userenv->{'branch'}; # select user branch by default
+}
 my $itemtype = $input->param('itemtype') || '';
 my $timeLimit = $input->param('timeLimit') || 3;
 my $advanced_search_types = C4::Context->preference('AdvancedSearchTypes');
@@ -138,7 +142,7 @@ $template->param(do_it => 1,
                 results_loop => \@results,
                 );
 
-$template->param( branchloop => GetBranchesLoop(C4::Context->userenv?C4::Context->userenv->{'branch'}:''));
+$template->param( branchloop => GetBranchesLoop($branch));
 
 # the index parameter is different for item-level itemtypes
 my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Mon Aug  5 08:14:11 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon,  5 Aug 2013 18:14:11 +1200
Subject: [Koha-patches] [PATCH] Bug 10078 - show location facet for all
Message-ID: <1375683251-32407-1-git-send-email-srdjan@catalyst.net.nz>

From: David Cook <dcook at prosentient.com.au>

Currently, the location facet only shows if you have singlebranch
mode enabled. In other words, you can either see the library branch
or the shelving location.

This patch simply changes the location facet so that it will always
show the shelving location (if one is available), regardless of the
singlebranch system preference.

Test Plan:

BEFORE APPLYING:

0) Disable singlebranch mode if it is on
1) Do an OPAC or Staff Client search for a record that has items with
shelving locations.
2) Note that you can see the library branch facet under Libraries
but no shelving locations.
3) Enable singlebranch mode
4) Repeat your search
5) Note that you can no longer see the library branch facet under
Libraries. However, you can see the shelving location under Location

N.B. If you don't have more than one branch or the search results
are all from one branch, you might not get a library branch facet.

If this is the case, create additional branches and/or change the
branch for items in your search results so that you have multiple
branches to prompt the appearance of a library branch facet.

AFTER APPLYING

1) Do an OPAC or Staff Client search for a record that has items with
shelving locations.
2) Note that you see a facet under Location on the left sidebar,
regardless of there being a singlebranch mode or the number of branches
there are being represented in the search results.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Koha.pm | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index ea8c2a6..1021ef2 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -730,6 +730,11 @@ sub getFacets {
                 tags  => [ qw/ 225a / ],
                 sep   => ', ',
             },
+            {
+                idx  => 'location',
+                label => 'Location',
+                tags        => [ qw/ 995c / ],
+            }
             ];
 
             my $library_facet;
@@ -739,12 +744,6 @@ sub getFacets {
                     label => 'Libraries',
                     tags        => [ qw/ 995b / ],
                 };
-            } else {
-                $library_facet = {
-                    idx  => 'location',
-                    label => 'Location',
-                    tags        => [ qw/ 995c / ],
-                };
             }
             push( @$facets, $library_facet );
     }
@@ -792,6 +791,11 @@ sub getFacets {
                 tags  => [ qw/ 952y 942c / ],
                 sep   => ', ',
             },
+            {
+                idx => 'location',
+                label => 'Location',
+                tags => [ qw / 952c / ],
+            },
             ];
 
             my $library_facet;
@@ -801,12 +805,6 @@ sub getFacets {
                     label => 'Libraries',
                     tags        => [ qw / 952b / ],
                 };
-            } else {
-                $library_facet = {
-                    idx => 'location',
-                    label => 'Location',
-                    tags => [ qw / 952c / ],
-                };
             }
             push( @$facets, $library_facet );
     }
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Tue Aug  6 03:12:22 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue,  6 Aug 2013 13:12:22 +1200
Subject: [Koha-patches] [PATCH] Bug 10643: Inappropriate uses of
	$sth->finish() in C4::ClassSource.pm
Message-ID: <1375751608-21587-1-git-send-email-srdjan@catalyst.net.nz>

From: root <root at kenza-VirtualBox>

This patch gets rid of finish() and replace prepare_cached by prepare.

>From the man page

finish()
Indicate that no more data will be fetched from this statement handle
before it is either executed again or destroyed.
You almost certainly do not need to call this method.

Adding calls to "finish" after loop that fetches all rows is a common
mistake, don't do it, it can mask genuine problems like uncaught fetch errors.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/ClassSource.pm | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/C4/ClassSource.pm b/C4/ClassSource.pm
index 63f6c67..810e8cc 100644
--- a/C4/ClassSource.pm
+++ b/C4/ClassSource.pm
@@ -93,12 +93,11 @@ sub GetClassSources {
 
     my %class_sources = ();
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare_cached("SELECT * FROM `class_sources`");
+    my $sth = $dbh->prepare("SELECT * FROM `class_sources`");
     $sth->execute();
     while (my $source = $sth->fetchrow_hashref) {
         $class_sources{ $source->{'cn_source'} } = $source;
     }
-    $sth->finish();
 
     return \%class_sources;
 
@@ -116,11 +115,10 @@ sub AddClassSource {
 
     my ($cn_source, $description, $used, $class_sort_rule) = @_;
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare_cached("INSERT INTO `class_sources` 
+    my $sth = $dbh->prepare("INSERT INTO `class_sources` 
                                            (`cn_source`, `description`, `used`, `class_sort_rule`)
                                            VALUES (?, ?, ?, ?)");
     $sth->execute($cn_source, $description, $used, $class_sort_rule);
-    $sth->finish();
   
 }
 
@@ -136,10 +134,9 @@ sub GetClassSource {
 
     my ($cn_source) = (@_);
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare_cached("SELECT * FROM `class_sources` WHERE cn_source = ?");
+    my $sth = $dbh->prepare("SELECT * FROM `class_sources` WHERE cn_source = ?");
     $sth->execute($cn_source);
     my $row = $sth->fetchrow_hashref();
-    $sth->finish();
     return $row;
 }
 
@@ -155,13 +152,12 @@ sub ModClassSource {
 
     my ($cn_source, $description, $used, $class_sort_rule) = @_;
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare_cached("UPDATE `class_sources` 
+    my $sth = $dbh->prepare("UPDATE `class_sources` 
                                     SET  `description` = ?,
                                          `used` = ?,
                                          `class_sort_rule` = ?
                                     WHERE `cn_source` = ?");
     $sth->execute($description, $used, $class_sort_rule, $cn_source);
-    $sth->finish();
 
 }
 
@@ -177,9 +173,8 @@ sub DelClassSource {
 
     my ($cn_source) = @_;
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare_cached("DELETE FROM `class_sources` WHERE `cn_source` = ?");
+    my $sth = $dbh->prepare("DELETE FROM `class_sources` WHERE `cn_source` = ?");
     $sth->execute($cn_source);
-    $sth->finish();
 
 }
 
@@ -210,12 +205,11 @@ sub GetClassSortRules {
 
     my %class_sort_rules = ();
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare_cached("SELECT * FROM `class_sort_rules`");
+    my $sth = $dbh->prepare("SELECT * FROM `class_sort_rules`");
     $sth->execute();
     while (my $sort_rule = $sth->fetchrow_hashref) {
         $class_sort_rules{ $sort_rule->{'class_sort_rule'} } = $sort_rule;
     }
-    $sth->finish();
 
     return \%class_sort_rules;
 
@@ -233,11 +227,10 @@ sub AddClassSortRule {
 
     my ($class_sort_rule, $description, $sort_routine) = @_;
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare_cached("INSERT INTO `class_sort_rules` 
+    my $sth = $dbh->prepare("INSERT INTO `class_sort_rules` 
                                            (`class_sort_rule`, `description`, `sort_routine`)
                                            VALUES (?, ?, ?)");
     $sth->execute($class_sort_rule, $description, $sort_routine);
-    $sth->finish();
   
 }
 
@@ -253,10 +246,9 @@ sub GetClassSortRule {
 
     my ($class_sort_rule) = (@_);
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare_cached("SELECT * FROM `class_sort_rules` WHERE `class_sort_rule` = ?");
+    my $sth = $dbh->prepare("SELECT * FROM `class_sort_rules` WHERE `class_sort_rule` = ?");
     $sth->execute($class_sort_rule);
     my $row = $sth->fetchrow_hashref();
-    $sth->finish();
     return $row;
 }
 
@@ -272,12 +264,11 @@ sub ModClassSortRule {
 
     my ($class_sort_rule, $description, $sort_routine) = @_;
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare_cached("UPDATE `class_sort_rules` 
+    my $sth = $dbh->prepare("UPDATE `class_sort_rules` 
                                     SET  `description` = ?,
                                          `sort_routine` = ?
                                     WHERE `class_sort_rule` = ?");
     $sth->execute($description, $sort_routine, $class_sort_rule);
-    $sth->finish();
 
 }
 
@@ -293,9 +284,8 @@ sub DelClassSortRule {
 
     my ($class_sort_rule) = @_;
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare_cached("DELETE FROM `class_sort_rules` WHERE `class_sort_rule` = ?");
+    my $sth = $dbh->prepare("DELETE FROM `class_sort_rules` WHERE `class_sort_rule` = ?");
     $sth->execute($class_sort_rule);
-    $sth->finish();
 
 }
 
@@ -313,13 +303,12 @@ sub GetSourcesForSortRule {
     my ($class_sort_rule) = @_;
 
     my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare_cached("SELECT cn_source FROM class_sources WHERE class_sort_rule = ?");
+    my $sth = $dbh->prepare("SELECT cn_source FROM class_sources WHERE class_sort_rule = ?");
     $sth->execute($class_sort_rule);
     my @sources = ();
     while (my ($source) = $sth->fetchrow_array()) {
         push @sources, $source;
     }
-    $sth->finish();
     return @sources;
 
 }
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Tue Aug  6 06:24:16 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Tue,  6 Aug 2013 16:24:16 +1200
Subject: [Koha-patches] [PATCH] Bug 5904: ysearch.pl members improvements
	(Independent branches behaviour)
Message-ID: <1375763056-11301-1-git-send-email-srdjan@catalyst.net.nz>

From: Jonathan Druart <jonathan.druart at biblibre.com>

Test plan:
- Add a staff user foo in a library A
- Add a staff user bar in a library B
- log in as foo and try to search 'bar'
- Switch on (Prevent) the new pref IndependentBranchPatron
- the search returns no result
- log in as a superlibrarian
- Check that you are allow to search all patrons.

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 circ/ysearch.pl                                    | 26 +++++++++++++++-------
 installer/data/mysql/sysprefs.sql                  |  1 +
 installer/data/mysql/updatedatabase.pl             |  7 ++++++
 .../prog/en/modules/admin/preferences/patrons.pref |  7 ++++++
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/circ/ysearch.pl b/circ/ysearch.pl
index 8a48c51..99acf80 100755
--- a/circ/ysearch.pl
+++ b/circ/ysearch.pl
@@ -44,13 +44,23 @@ if ($auth_status ne "ok") {
 }
 
 my $dbh = C4::Context->dbh;
-my $sql = qq(SELECT surname, firstname, cardnumber, address, city, zipcode, country
-             FROM borrowers
-             WHERE surname LIKE ?
-             OR firstname LIKE ?
-             OR cardnumber LIKE ?
-             ORDER BY surname, firstname
-             LIMIT 10);
+my $sql = q(
+    SELECT surname, firstname, cardnumber, address, city, zipcode, country
+    FROM borrowers
+    WHERE ( surname LIKE ?
+        OR firstname LIKE ?
+        OR cardnumber LIKE ? )
+);
+if (C4::Context->preference("IndependentBranchPatron")){
+  if ( C4::Context->userenv
+      && (C4::Context->userenv->{flags} % 2) !=1
+      && C4::Context->userenv->{'branch'}
+  ){
+     $sql .= " AND borrowers.branchcode =" . $dbh->quote(C4::Context->userenv->{'branch'});
+  }
+}
+
+$sql    .= q( ORDER BY surname, firstname LIMIT 10);
 my $sth = $dbh->prepare( $sql );
 $sth->execute("$query%", "$query%", "$query%");
 
@@ -68,4 +78,4 @@ while ( my $rec = $sth->fetchrow_hashref ) {
           "}";
     $i++;
 }
-print "]";
\ No newline at end of file
+print "]";
diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
index c8caee7..9e8db83 100644
--- a/installer/data/mysql/sysprefs.sql
+++ b/installer/data/mysql/sysprefs.sql
@@ -430,3 +430,4 @@ INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) V
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('CalculateFinesOnReturn','1','Switch to control if overdue fines are calculated on return or not', '', 'YesNo');
 INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AcqWarnOnDuplicateInvoice','0','Warn librarians when they try to create a duplicate invoice', '', 'YesNo');
 INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowTooManyOverride', '1', 'If on, allow staff to override and check out items when the patron has reached the maximum number of allowed checkouts', '', 'YesNo');
+INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('IndependentBranchPatron','0','Allow/Don\'t allow limit to the librarian branch in circ member auto completion', '', 'YesNo');
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 74aeb3e..cf2b8b5 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -7067,6 +7067,13 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.13.00.XXX";
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+    $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('IndependentBranchPatron','0','Allow/Don\'t allow limit to the librarian branch in circ member auto completion', '', 'YesNo')");
+    print "Upgrade to $DBversion done (Bug 5904: Add syspref IndependentBranchPatron)\n";
+    SetVersion ($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index 74d14af..520a9aa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -139,3 +139,10 @@ Patrons:
                yes: Do
                no: "Don't"
          - enable the ability to upload and attach arbitrary files to a borrower record.
+     -
+         - pref: IndependentBranchPatron
+           choices:
+               yes: Prevent
+               no: "Don't prevent"
+         - staff (but not superlibrarians) from searching patrons belonging to other libraries.
+
-- 
1.8.1.2

From oleonard at myacpl.org  Thu Aug  8 17:08:23 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  8 Aug 2013 11:08:23 -0400
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_10404_=5BCSS_follow-up?=
	=?utf-8?q?=5D_Add_previous/next_browsing_to_staff_client_search_re?=
	=?utf-8?q?sults?=
Message-ID: <1375974503-11245-1-git-send-email-oleonard@myacpl.org>

This patch slightly modifies the styles of the previous/next links in a
way that I think is simpler and clearer.

To test, apply the patch and clear your browser cache if necessary.
Perform a search in the staff client, click any result, and look at the
prevous/next links. If you think this is an improvement, sign off!
---
 koha-tmpl/intranet-tmpl/js/browser.js              |    2 +-
 .../intranet-tmpl/prog/en/css/staff-global.css     |   40 ++++++++++++++------
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/js/browser.js b/koha-tmpl/intranet-tmpl/js/browser.js
index bd73a4f..fd99bb1 100644
--- a/koha-tmpl/intranet-tmpl/js/browser.js
+++ b/koha-tmpl/intranet-tmpl/js/browser.js
@@ -67,7 +67,7 @@ KOHA.browser = function (searchid, biblionumber) {
                     } else {
                         nextbutton = '<a href="#" id="browse-next" class="browse-button">' + BROWSER_NEXT + ' ?</a>';
                     }
-                    $('#menu').before('<div class="browse-controls"><div class="browse-controls-inner"><div class="browse-label"><a href="' + searchURL + '" id="browse-return-to-results" class="browse-button">' + BROWSER_RETURN_TO_SEARCH + '</a></div><div>' + prevbutton + nextbutton + '</div></div></div>');
+                    $('#menu').before('<div class="browse-controls"><div class="browse-controls-inner"><div class="browse-label"><a href="' + searchURL + '" id="browse-return-to-results" class="browse-button">' + BROWSER_RETURN_TO_SEARCH + '</a></div><div class="browse-prev-next">' + prevbutton + nextbutton + '</div></div></div>');
                     $('a#browse-previous').click(function (ev) {
                         ev.preventDefault();
                         browseRecords(searchid, -1);
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 086489b..e792cab 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2592,28 +2592,20 @@ fieldset.rows table.mceListBox {
 }
 
 .browse-controls {
-    padding-top: 1em;
     margin-left: 1.1em;
-    border-right: 1px solid #b9d8d9;
     margin-right: .5em;
     padding-bottom: 1em;
-}
-
-.browse-controls-inner {
-    padding: 0.3em;
-    background: #e8f0f6;
-    border-top-left-radius: 5px;
-    border-bottom-left-radius: 5px;
-    border: 1px solid #b9d8d9;
+    padding-top: 1em;
 }
 
 #browse-return-to-results {
+    border-top-left-radius : 3px;
+    border-top-right-radius : 3px;
     display: block;
     text-align: center;
 }
 
 .browse-button {
-    border: 1px solid #b9d8d9;
     color: #004d99;
     padding: .4em .6em;
     display: inline-block;
@@ -2628,6 +2620,32 @@ span.browse-button {
     background: #fafafa;
 }
 
+.browse-label,
+.browse-prev-next {
+    border: 1px solid #b9d8d9;
+}
+
+.browse-label {
+    border-top-left-radius : 5px;
+    border-top-right-radius : 5px;
+    background-color : #e8f0f6;
+}
+
+.browse-prev-next {
+    border-top-width: 0;
+    border-bottom-left-radius: 5px;
+    border-bottom-right-radius: 5px;
+}
+
+#browse-previous {
+    border-right : 1px solid #B9D8D9;
+    border-bottom-left-radius: 5px;
+    padding-right: 1em;
+}
+
 #browse-next {
+    border-top-width : 0;
+    border-bottom-right-radius: 5px;
     float: right;
+    padding-right: 1em;
 }
-- 
1.7.9.5

From tomascohen at gmail.com  Thu Aug  8 21:34:37 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Thu,  8 Aug 2013 16:34:37 -0300
Subject: [Koha-patches] [PATCH] Bug 8507: koha-create should be updated to
	use DOM indexing for bib
Message-ID: <1375990477-7573-1-git-send-email-tomascohen@gmail.com>

This patch makes the koha-create script install the file zebra-biblios-dom.cfg
with the proper string substitutions inside on the new instance.

It also adds two option switches that control the indexing mode for the instance:

 --biblio-idx {dom|grs1}
 --auth-idx {dom|grs1}

DOM indexing is set as the default for both authorities and bibliographic records.

To test:
- Apply the patch
- Build your own packages and install them on a test server
a) Create a new instance without using the new switches like:
 $ koha-create --create-db domtest
 - Check there's a file /etc/koha/sites/domtest/zebra-biblios-dom.cfg
 - Check that /etc/koha/sites/domtest/koha-conf.xml points to:
   * zebra-biblios-dom.cfg (biblioserver section)
   * zebra-biblios-dom.cfg (publicserver section)
   * zebra-authorities-dom.cfg (authorityserver section)
 - Success means the new default is DOM
b) Play with the 4 possible combination of option switches
 $ koha-create --create-db --auth-idx grs1 --biblio-idx grs1 domtest
 $ koha-create --create-db --auth-idx grs1 --biblio-idx dom domtest
 $ koha-create --create-db --auth-idx dom --biblio-idx grs1 domtest
 $ koha-create --create-db --auth-idx dom --biblio-idx dom domtest
 - Check the koha-conf.xml file reflects the chosen options.
c) Run
 $ koha-create --help
 - It should advertise this addition accordingly.
d) Run
 $ man koha-create
 - Man page for koha-create should provide good information on the new switches behaviour

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 debian/docs/koha-create.xml                    |   16 +++++++++
 debian/scripts/koha-create                     |   45 +++++++++++++++++++++++-
 debian/templates/koha-conf-site.xml.in         |    6 ++--
 debian/templates/zebra-biblios-dom-site.cfg.in |   22 ++++++------
 4 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/debian/docs/koha-create.xml b/debian/docs/koha-create.xml
index 491da62..31c168a 100644
--- a/debian/docs/koha-create.xml
+++ b/debian/docs/koha-create.xml
@@ -27,6 +27,8 @@
       <arg choice="req"><option>--create-db</option>|<option>--request-db</option>|<option>--populate-db</option>|<option>--use-db</option></arg>
       <arg><option>--marcflavor</option> marc21|normarc|unimarc</arg>
       <arg><option>--zebralang</option> en|es|fr|nb|ru|uk</arg>
+      <arg><option>--auth-idx</option> dom|grs1</arg>
+      <arg><option>--biblio-idx</option> dom|grs1</arg>
       <arg><option>--defaultsql</option> /path/to/some.sql</arg>
       <arg><option>--configfile</option> /path/to/config</arg>
       <arg><option>--passwdfile</option> /path/to/passwd</arg>
@@ -109,6 +111,20 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term><option>--auth-idx</option></term>
+      <listitem>
+        <para>Specified the desired indexing mode for authority records. Valid options are <option>dom</option> (default) and <option>grs1</option>.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><option>--biblio-idx</option></term>
+      <listitem>
+        <para>Specified the desired indexing mode for bibliographic records. Valid options are <option>dom</option> (default) and <option>grs1</option>.</para>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
   </refsect1>
 
diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index a0a830a..655a163 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -22,6 +22,7 @@ set -e
 usage="Usage: $0 [--create-db|--request-db|--populate-db|--use-db] \
     [--marcflavor marc21|normarc|unimarc] \
     [--zebralang en|es|fr|nb|ru|uk] \
+    [--auth-idx dom|grs1] [--biblio-idx dom|grs1] \
     [--defaultsql /path/to/some.sql] \
     [--configfile /path/to/config] [--passwdfile /path/to/passwd] \
     [--database database] [--adminuser n] instancename"
@@ -45,6 +46,8 @@ generate_config_file() {
         -e "s/__ZEBRA_PASS__/$zebrapwd/g" \
         -e "s/__ZEBRA_MARC_FORMAT__/$ZEBRA_MARC_FORMAT/g" \
         -e "s/__ZEBRA_LANGUAGE__/$ZEBRA_LANGUAGE/g" \
+        -e "s/__BIBLIO_INDEXING__/$BIBLIO_INDEXING/g" \
+        -e "s/__AUTHORITY_INDEXING__/$AUTHORITY_INDXING/g" \
         -e "s/__DB_NAME__/$mysqldb/g" \
         -e "s/__DB_HOST__/$mysqlhost/g" \
         -e "s/__DB_USER__/$mysqluser/g" \
@@ -75,6 +78,40 @@ getinstancemysqldatabase() {
     xmlstarlet sel -t -v 'yazgfs/config/database' "/etc/koha/sites/$1/koha-conf.xml"
 }
 
+set_authority_indexing()
+{
+    indexing_mode=$1
+
+    case $indexing_mode in
+        "grs1")
+            AUTHORITY_INDEXING=""
+            ;;
+        "dom")
+            AUTHORITY_INDEXING="-dom"
+            ;;
+        *)
+            die "Error: '$indexing_mode' is not a valid indexing mode for authority records."
+            ;;
+    esac
+}
+
+set_biblio_indexing()
+{
+    indexing_mode=$1
+
+    case $indexing_mode in
+        "grs1")
+            BIBLIO_INDEXING=""
+            ;;
+        "dom")
+            BIBLIO_INDEXING="-dom"
+            ;;
+        *)
+            die "Error: '$indexing_mode' is not a valid indexing mode for bibliographic records."
+            ;;
+    esac
+}
+
 # Set defaults and read config file, if it exists.
 DOMAIN=""
 OPACPORT="80"
@@ -86,6 +123,8 @@ INTRASUFFIX=""
 DEFAULTSQL=""
 ZEBRA_MARC_FORMAT="marc21"
 ZEBRA_LANGUAGE="en"
+BIBLIO_INDEXING="-dom"
+AUTHORITY_INDEXING="-dom"
 ADMINUSER="1"
 PASSWDFILE="/etc/koha/passwd"
 if [ -e /etc/koha/koha-sites.conf ]
@@ -95,7 +134,7 @@ fi
 
 [ $# -ge 2 ] && [ $# -le 16 ] || die $usage
 
-TEMP=`getopt -o crpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,marcflavor:,zebralang:,defaultsql:,configfile:,passwdfile:,database:,adminuser: \
+TEMP=`getopt -o crpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,marcflavor:,auth-idx:,biblio-idx:,zebralang:,defaultsql:,configfile:,passwdfile:,database:,adminuser: \
      -n "$0" -- "$@"`
 
 # Note the quotes around `$TEMP': they are essential!
@@ -115,6 +154,8 @@ while true ; do
         -u|--use-db) op=use ; shift ;;
 		-m|--marcflavor) CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
 		-l|--zebralang) CLO_ZEBRA_LANGUAGE="$2" ; shift 2 ;;
+		--auth-idx) set_authority_indexing "$2" ; shift 2 ;;
+		--biblio-idx) set_biblio_indexing "$2" ; shift 2 ;;
 		-d|--defaultsql) CLO_DEFAULTSQL="$2" ; shift 2 ;;
 		-f|--configfile) configfile="$2" ; shift 2 ;;
         -s|--passwdfile) CLO_PASSWDFILE="$2" ; shift 2 ;;
@@ -261,6 +302,8 @@ eof
     # Generate and install Zebra config files.
     generate_config_file zebra-biblios-site.cfg.in \
         "/etc/koha/sites/$name/zebra-biblios.cfg"
+    generate_config_file zebra-biblios-dom-site.cfg.in \
+        "/etc/koha/sites/$name/zebra-biblios-dom.cfg"
     generate_config_file zebra-authorities-site.cfg.in \
         "/etc/koha/sites/$name/zebra-authorities.cfg"
     generate_config_file zebra-authorities-dom-site.cfg.in \
diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index ab8aff5..64235a6 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -26,7 +26,7 @@
 <!-- BIBLIOGRAPHIC RECORDS -->
 <server id="biblioserver"  listenref="biblioserver">
     <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
-    <config>/etc/koha/sites/__KOHASITE__/zebra-biblios.cfg</config>
+    <config>/etc/koha/sites/__KOHASITE__/zebra-biblios__BIBLIO_INDEXING__.cfg</config>
     <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
      <retrievalinfo>
        <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
@@ -102,7 +102,7 @@
 <!-- AUTHORITY RECORDS -->
 <server id="authorityserver"  listenref="authorityserver" >
     <directory>/var/lib/koha/__KOHASITE__/authorities</directory>
-    <config>/etc/koha/sites/__KOHASITE__/zebra-authorities-dom.cfg</config>
+    <config>/etc/koha/sites/__KOHASITE__/zebra-authorities__AUTHORITY_INDEXING__.cfg</config>
     <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
     <xi:include href="/etc/koha/__ZEBRA_MARC_FORMAT__-retrieval-info-auth-dom.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude">
@@ -176,7 +176,7 @@
 
 <server id="publicserver"  listenref="publicserver">
     <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
-    <config>/etc/koha/sites/__KOHASITE__/zebra-biblios.cfg</config>
+    <config>/etc/koha/sites/__KOHASITE__/zebra-biblios__BIBLIO_INDEXING__.cfg</config>
     <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
      <retrievalinfo>
        <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
diff --git a/debian/templates/zebra-biblios-dom-site.cfg.in b/debian/templates/zebra-biblios-dom-site.cfg.in
index a748ddd..88d0d6d 100644
--- a/debian/templates/zebra-biblios-dom-site.cfg.in
+++ b/debian/templates/zebra-biblios-dom-site.cfg.in
@@ -3,7 +3,7 @@
 # $Id: zebra.cfg,v 1.1.2.2 2006/05/09 12:03:16 rangi Exp $
 #
 # Where are the config files located?
-profilePath:__ZEBRA_CONF_DIR__/biblios/etc:__ZEBRA_CONF_DIR__/etc:__ZEBRA_CONF_DIR__/marc_defs/__ZEBRA_MARC_FORMAT__/biblios:__ZEBRA_CONF_DIR__/lang_defs/__ZEBRA_LANGUAGE__:__ZEBRA_CONF_DIR__/xsl
+profilePath:/etc/koha/zebradb/biblios/etc:/etc/koha/zebradb/etc:/etc/koha/zebradb/marc_defs/__ZEBRA_MARC_FORMAT__/biblios:/etc/koha/zebradb/lang_defs/__ZEBRA_LANGUAGE__:/etc/koha/zebradb/xsl
 # modulePath - where to look for loadable zebra modules
 modulePath: /usr/lib/idzebra-2.0/modules
 
@@ -21,9 +21,9 @@ attset: gils.att
 # http://www.indexdata.dk/zebra/doc/zebra-cfg.tkl
 # http://www.indexdata.dk/zebra/doc/grs.tkl
 
-recordtype: dom.__ZEBRA_CONF_DIR__/biblios/etc/dom-config.xml
-marcxml.recordtype: dom.__ZEBRA_CONF_DIR__/biblios/etc/dom-config.xml
-iso2709.recordtype: dom.__ZEBRA_CONF_DIR__/biblios/etc/dom-config-marc.xml
+recordtype: dom./etc/koha/zebradb/biblios/etc/dom-config.xml
+marcxml.recordtype: dom./etc/koha/zebradb/biblios/etc/dom-config.xml
+iso2709.recordtype: dom./etc/koha/zebradb/biblios/etc/dom-config-marc.xml
 
 recordId: (bib1,Local-number)
 storeKeys:1
@@ -31,18 +31,18 @@ storeData:1
 
 
 # Lock File Area
-lockDir: __ZEBRA_LOCK_DIR__/biblios
+lockDir: /var/lock/koha/__KOHASITE__/biblios
 perm.anonymous:ar
-perm.__ZEBRA_USER__:rw
-passwd: __ZEBRA_CONF_DIR__/etc/passwd
-register: __ZEBRA_DATA_DIR__/biblios/register:20G
-shadow: __ZEBRA_DATA_DIR__/biblios/shadow:20G
+perm.kohauser:rw
+passwd: /etc/koha/sites/__KOHASITE__/zebra.passwd
+register: /var/lib/koha/__KOHASITE__/biblios/register:20G
+shadow: /var/lib/koha/__KOHASITE__/biblios/shadow:20G
 
 # Temp File area for result sets
-setTmpDir: __ZEBRA_DATA_DIR__/biblios/tmp
+setTmpDir: /var/lib/koha/__KOHASITE__/biblios/tmp
 
 # Temp File area for index program
-keyTmpDir: __ZEBRA_DATA_DIR__/biblios/key
+keyTmpDir: /var/lib/koha/__KOHASITE__/biblios/key
 
 # Approx. Memory usage during indexing
 memMax: 50M
-- 
1.7.9.5


From oleonard at myacpl.org  Thu Aug  8 21:43:29 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  8 Aug 2013 15:43:29 -0400
Subject: [Koha-patches] [PATCH] Bug 10701 - In transit information doesn't
	display on the bibliographic detail page
Message-ID: <1375991009-13632-1-git-send-email-oleonard@myacpl.org>

The patch for Bug 10083 incorrectly changed some template variable names
so that in-transit details could not be shown on the biblio detail page.
This patch corrects the error.

To test, perform any action that will trigger an transfer between
libraries (for instance, check in an item from Library A at Library B).
View the detail page for that title and look for the transfer details in
the status column of the holdings table. It should show correct
information:

"In transit from Athens to Nelsonville since 08/08/2013"
---
 .../prog/en/modules/catalogue/detail.tt            |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 b3a4240..507447b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -419,7 +419,7 @@ function verify_images() {
                                 : due [% item.datedue %]
                             </span>
                         [% ELSIF ( item.transfertwhen ) %]
-                            <span class="intransit">In transit from [% itemloo.transfertfrom %] to [% itemloo.transfertto %] since [% itemloo.transfertwhen %]</span>
+                            <span class="intransit">In transit from [% item.transfertfrom %] to [% item.transfertto %] since [% item.transfertwhen %]</span>
                         [% END %]
 
                         [% IF ( item.itemlost ) %]
-- 
1.7.9.5

From oleonard at myacpl.org  Thu Aug  8 22:10:15 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu,  8 Aug 2013 16:10:15 -0400
Subject: [Koha-patches] [PATCH] Bug 5825 - Add Item Type column to Holds
	Queue report
Message-ID: <1375992615-14290-1-git-send-email-oleonard@myacpl.org>

The hold queue report shows collection code but not item type. This
patch adds it. Also added is use of the KohaAuthorisedValues template
plugin to display the collection code description instead of code.

To test, apply the patch and view the holds queue. There should be a new
item type column showing an item type description for each row. The
collection column should now show the collection description instead of
code.
---
 C4/HoldsQueue.pm                                   |    2 +-
 .../prog/en/modules/circ/view_holdsqueue.tt        |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm
index 2052f09..1242fc5 100755
--- a/C4/HoldsQueue.pm
+++ b/C4/HoldsQueue.pm
@@ -119,7 +119,7 @@ sub GetHoldsQueueItems {
     my $dbh   = C4::Context->dbh;
 
     my @bind_params = ();
-    my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn,items.copynumber
+    my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.itype, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn,items.copynumber
                   FROM tmp_holdsqueue
                        JOIN biblio      USING (biblionumber)
                   LEFT JOIN biblioitems USING (biblionumber)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
index 4c5f8d1..3482de6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt
@@ -1,3 +1,5 @@
+[% USE ItemTypes %]
+[% USE KohaAuthorisedValues %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Circulation &rsaquo; Holds queue</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -13,7 +15,7 @@
 <script type="text/javascript">//<![CDATA[
 $(document).ready(function() {
     $("#holdst").dataTable({
-        "aaSorting": [[ 2, "asc" ]],
+        "aaSorting": [[ 3, "asc" ]],
         "bPaginate": false,
         "bLengthChange": false,
         "bFilter": false,
@@ -53,6 +55,7 @@ $(document).ready(function() {
 	<tr>
         <th class="hq-title">Title</th>
         <th class="hq-collection">Collection</th>
+        <th class="hq-itemtype">Item type</th>
         <th class="hq-callnumber">Call number</th>
         <th class="hq-copynumber">Copy number</th>
         <th class="hq-enumchron">Enumeration</th>
@@ -74,7 +77,8 @@ $(document).ready(function() {
                                          [% IF ( itemsloo.size ) %][% itemsloo.size %][% END %] [% IF ( itemsloo.isbn ) %]ISBN: [% itemsloo.isbn %][% END %]</p>
 			</div>
 			</td>
-            <td class="hq-collection">[% itemsloo.ccode %]</td>
+            <td class="hq-collection">[% KohaAuthorisedValues.GetByCode( 'CCODE', itemsloo.ccode ) %]</td>
+            <td class="hq-itemtype">[% ItemTypes.GetDescription( itemsloo.itype ) %]</td>
             <td class="hq-callnumber">[% itemsloo.location %] [% itemsloo.itemcallnumber %]</td>
             <td class="hq-copynumber">[% itemsloo.copynumber %]</td>
             <td class="hq-enumchron">[% itemsloo.enumchron %]</td>
-- 
1.7.9.5

From nengard at bywatersolutions.com  Thu Aug  8 14:50:49 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu,  8 Aug 2013 08:50:49 -0400
Subject: [Koha-patches] [PATCH] Bug 10703: Add db documentation for
	biblioimages table
Message-ID: <1375966249-4213-1-git-send-email-nengard@bywatersolutions.com>

This patch adds db documentation to the biblioimages table.

To test:

Apply patch
Review kohastructure.sql to be sure that the documentation is there
---
 installer/data/mysql/kohastructure.sql |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 8a8b70f..eb565d0 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -3013,12 +3013,12 @@ CREATE TABLE transport_cost (
 
 DROP TABLE IF EXISTS `biblioimages`;
 
-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,
+CREATE TABLE `biblioimages` ( -- local cover images
+ `imagenumber` int(11) NOT NULL AUTO_INCREMENT, -- unique identifier for the image
+ `biblionumber` int(11) NOT NULL, -- foreign key from biblio table to link to biblionumber
+ `mimetype` varchar(15) NOT NULL, -- image type
+ `imagefile` mediumblob NOT NULL, -- image file contents
+ `thumbnail` mediumblob NOT NULL, -- thumbnail file contents
  PRIMARY KEY (`imagenumber`),
  CONSTRAINT `bibliocoverimage_fk1` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-- 
1.7.2.3


From nengard at bywatersolutions.com  Thu Aug  8 14:54:42 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu,  8 Aug 2013 08:54:42 -0400
Subject: [Koha-patches] [PATCH] Bug 10703: Document quotes table
Message-ID: <1375966482-4264-1-git-send-email-nengard@bywatersolutions.com>

Add db documentation for the quotes table

To test:

apply patch
review kohastructure.sql to be sure documentation is there
---
 installer/data/mysql/kohastructure.sql |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 8a8b70f..eacb929 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -3059,11 +3059,11 @@ CREATE TABLE ratings ( -- information related to the star ratings in the OPAC
 --
 
 DROP TABLE IF EXISTS quotes;
-CREATE TABLE `quotes` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `source` text DEFAULT NULL,
-  `text` mediumtext NOT NULL,
-  `timestamp` datetime NOT NULL,
+CREATE TABLE `quotes` ( -- data for the quote of the day feature
+  `id` int(11) NOT NULL AUTO_INCREMENT, -- unique id for the quote
+  `source` text DEFAULT NULL, -- source/credit for the quote
+  `text` mediumtext NOT NULL, -- text of the quote
+  `timestamp` datetime NOT NULL, -- date and time that the quote last appeared in the opac
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-- 
1.7.2.3


From nengard at bywatersolutions.com  Thu Aug  8 15:02:00 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu,  8 Aug 2013 09:02:00 -0400
Subject: [Koha-patches] [PATCH] Bug 10703: Document borrower_files table
Message-ID: <1375966920-4340-1-git-send-email-nengard@bywatersolutions.com>

Add db documentation to borrower_files table.

To test:

apply
review kohastructure.sql to be sure documentation is there
---
 installer/data/mysql/kohastructure.sql |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 8a8b70f..e45f991 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2523,14 +2523,14 @@ CREATE TABLE `message_transports` (
 --
 
 DROP TABLE IF EXISTS `borrower_files`;
-CREATE TABLE IF NOT EXISTS `borrower_files` (
-  `file_id` int(11) NOT NULL AUTO_INCREMENT,
-  `borrowernumber` int(11) NOT NULL,
-  `file_name` varchar(255) NOT NULL,
-  `file_type` varchar(255) NOT NULL,
-  `file_description` varchar(255) DEFAULT NULL,
-  `file_content` longblob NOT NULL,
-  `date_uploaded` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+CREATE TABLE IF NOT EXISTS `borrower_files` ( -- files attached to the patron/borrower record
+  `file_id` int(11) NOT NULL AUTO_INCREMENT, -- unique key
+  `borrowernumber` int(11) NOT NULL, -- foreign key linking to the patron via the borrowernumber
+  `file_name` varchar(255) NOT NULL, -- file name
+  `file_type` varchar(255) NOT NULL, -- type of file
+  `file_description` varchar(255) DEFAULT NULL, -- description given to the file
+  `file_content` longblob NOT NULL, -- the file
+  `date_uploaded` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, -- date and time the file was added
   PRIMARY KEY (`file_id`),
   KEY `borrowernumber` (`borrowernumber`),
   CONSTRAINT borrower_files_ibfk_1 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE
-- 
1.7.2.3


From oleonard at myacpl.org  Fri Aug  9 17:19:52 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  9 Aug 2013 11:19:52 -0400
Subject: [Koha-patches] [PATCH] Bug 7478 - Template/translation problem in
	catalogue_out.tt
Message-ID: <1376061592-16262-1-git-send-email-oleonard@myacpl.org>

The items with no checkouts template has a sections that uses DEFAULT to
set some strings: [% DEFAULT loopro.itemcallnumber="No Call Number" %]
This appears to be untranslatable with our current translation tool.

This patch changes the template so that it uses a simple [% IF %] block
to display the default text if no value is set. Added is use of the
Branches template plugin to show library name instead of code.

This patch also fixes an error introduced in my fix for Bug 8124 causing
the page to default to CSV download instead of output to screen.

To test, apply the patch and confirm that the default text appears
onscreen in reports which include results that have a missing barcode,
title, or call number. Results should be displayed on screen correctly.

Run "perl translate update" for any language and confirm that the newly
generated po file includes "No call number," "No barcode," and "NO
TITLE" for catalogue_out.tt
---
 .../prog/en/modules/reports/catalogue_out.tt       |   19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
index b098cc7..1e8d011 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tt
@@ -1,3 +1,4 @@
+[% USE Branches %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Reports &rsaquo; Items with no checkouts</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -65,21 +66,14 @@
 			</tr>
 				[% IF ( looptable.looprow ) %]
 				[% FOREACH loopro IN looptable.looprow %]
-				[% DEFAULT
-                    loopro.itemcallnumber="No call number"
-                    loopro.barcode="No barcode"
-				    loopro.title="NO TITLE"
-				    loopro.author=""
-				%]
 				    [% UNLESS ( loop.odd ) %]<tr class="highlight">
 		                    [% ELSE %]<tr>[% END %]
 		    
 						<td>[% loop.count %]</td>
-						<td>[% loopro.itemcallnumber %]</td>
-						<td>[% loopro.barcode %]</td>
- 						<td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.biblionumber %]">[% loopro.title %]</a></p>
-							[% loopro.author %]
-							[% IF ( loopro.branch ) %]at [% loopro.branch %][% END %]
+                        <td>[% IF ( loopro.itemcallnumber ) %][% loopro.itemcallnumber %][% ELSE %]No call number[% END %]</td>
+                        <td>[% IF ( loopro.barcode ) %][% loopro.barcode %][% ELSE %]No barcode[% END %]</td>
+                        <td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopro.biblionumber %]">[% IF ( loopro.title ) %][% loopro.title %][% ELSE %]NO TITLE[% END %]</a> [% IF ( loopro.author ) %] by [% loopro.author %][% END %]</p>
+                            [% IF ( loopro.branch ) %]at [% Branches.GetName( loopro.branch ) %][% END %]
 						</td>
 					</tr>
 				[% END %]
@@ -159,7 +153,8 @@
 	<fieldset class="action">
 	<input type="submit" value="Submit" />
 	<input type="hidden" name="report_name" value="[% report_name %]" />
-	<input type="hidden" name="do_it" value="1" />
+    <input type="hidden" name="do_it" value="1" />
+    <input type="hidden" name="output" value="screen" />
 	</fieldset>
 	</form>
 [% END %]
-- 
1.7.9.5

From oleonard at myacpl.org  Fri Aug  9 17:44:26 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  9 Aug 2013 11:44:26 -0400
Subject: [Koha-patches] [PATCH] Bug 10587 - HTML errors on authority detail
	page in OPAC
Message-ID: <1376063067-16698-1-git-send-email-oleonard@myacpl.org>

A validator check of the OPAC's authority detail returns a few minor
errors. This patch corrects the errors.

To test, apply the patch and run an OPAC authority detail page through
an HTML validator. There should be no errors which are specific to the
authorities detail template (as opposed to header and footer includes).
---
 .../opac-tmpl/prog/en/modules/opac-auth-detail.tt  |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt
index 8367b04..78bc5b9 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth-detail.tt
@@ -3,9 +3,9 @@
 [% INCLUDE 'doc-head-open.inc' %][% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo;  Entry
 [% INCLUDE 'doc-head-close.inc' %]
 [% IF ( displayhierarchy ) %]
-<script language="javascript" type="text/javascript" src="/opac-tmpl/lib/jquery/plugins/jquery.jstree.js"></script>
+<script type="text/javascript" src="/opac-tmpl/lib/jquery/plugins/jquery.jstree.js"></script>
 [% END %]
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 //<![CDATA[
 $(document).ready(function() {
     $('#authdescriptions').tabs();
@@ -33,7 +33,7 @@ $(document).ready(function() {
     <div id="yui-main">
     <div class="yui-b"><div class="yui-g">
 
-    <div id="views"><span class="view"><span id="Normalview">Normal view</span></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% authid %]&marc=1">MARC view</a></span></div>
+    <div id="views"><span class="view"><span id="Normalview">Normal view</span></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-authoritiesdetail.pl?authid=[% authid %]&amp;marc=1">MARC view</a></span></div>
 
 <div id="userauthdetails" class="container">
 
@@ -61,6 +61,7 @@ $(document).ready(function() {
         <span class="seefrom">[% PROCESS authheadingdisplay heading=seefro.heading search=seefrosearch authid=seefro.authid %]</span>
         </li>
     [% END %]
+    </ul>
     [% PROCESS otherscript headings=summary.otherscript wantcategory='seefrom' %]
     </div>
 [% END %]
@@ -107,5 +108,5 @@ $(document).ready(function() {
 </div>
 </div>
 </div>
-</div>
+
 [% INCLUDE 'opac-bottom.inc' %]
-- 
1.7.9.5

From oleonard at myacpl.org  Fri Aug  9 19:49:17 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Fri,  9 Aug 2013 13:49:17 -0400
Subject: [Koha-patches] [PATCH] Bug 9943 - Pay fines page "Pay selected"
	button give invalid amount when nothing is selected
Message-ID: <1376070557-19058-1-git-send-email-oleonard@myacpl.org>

If you select no fines but click the "pay selected" button the resulting
screen offers to let you pay against all fines, which is confusing. To
simplify things this patch disables the "pay selected" button if no
lines are selected.

To test, apply the patch and find a patron with outstanding fines. From
the "pay fines" page (members/pay.pl) try selecting and deselecting
checkboxes and using the "select all" and "clear all" links. When no
item is selected the "Pay selected" button should become disabled.
Confirm that the form submits correctly when one or more fines is
selected.
---
 .../intranet-tmpl/prog/en/modules/members/pay.tt   |   31 ++++++++++++++++----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
index 9b50924..91f1609 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt
@@ -4,6 +4,15 @@
 <script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type= "text/javascript">
 //<![CDATA[
+function enableCheckboxActions(){
+    // Enable/disable controls if checkboxes are checked
+    var checkedBoxes = $("input.cb:checked");
+    if ($(checkedBoxes).size()) {
+      $("#payselected").prop("disabled",false);
+    } else {
+      $("#payselected").prop("disabled",true);
+    }
+}
     $(document).ready(function(){
  $('#pay-fines-form').preventDoubleFormSubmit();
         $("#woall").click(function(event){
@@ -12,8 +21,20 @@
                     event.preventDefault();
                 }
         });
-        $('#CheckAll').click(function(){ $("#finest").checkCheckboxes(); return false;});
-        $('#CheckNone').click(function(){ $("#finest").unCheckCheckboxes(); return false;});
+        $('#CheckAll').click(function(){
+            $("#finest").checkCheckboxes();
+            enableCheckboxActions();
+            return false;
+        });
+        $('#CheckNone').click(function(){
+            $("#finest").unCheckCheckboxes();
+            enableCheckboxActions();
+            return false;
+        });
+        $(".cb").change(function(){
+            enableCheckboxActions();
+        });
+        enableCheckboxActions();
     });
 //]]>
 </script>
@@ -71,7 +92,7 @@
 <tr>
     <td>
     [% IF ( line.amountoutstanding > 0 ) %]
-        <input type="checkbox" checked="checked" name="incl_par_[% line.accountno %]" />
+        <input class="cb" type="checkbox" checked="checked" name="incl_par_[% line.accountno %]" />
     [% END %]
     </td>
     <td>
@@ -111,9 +132,9 @@
 </tbody>
 </table>
 <fieldset class="action">
-<input type="submit" name="paycollect"  value="Pay amount" class="submit" />
+<input type="submit" id="paycollect" name="paycollect"  value="Pay amount" class="submit" />
 <input type="submit" name="woall"  id="woall" value="Write off all" class="submit" />
-<input type="submit" name="payselected"  value="Pay selected" class="submit" />
+<input type="submit" id="payselected" name="payselected"  value="Pay selected" class="submit" />
 <a class="cancel" href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrower.borrowernumber %]">Cancel</a>
 </fieldset>
 </form>
-- 
1.7.9.5


From tomascohen at gmail.com  Fri Aug  9 20:52:11 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Fri,  9 Aug 2013 15:52:11 -0300
Subject: [Koha-patches] [PATCH] Bug 8507: koha-create should be updated to
	use DOM indexing for bib
Message-ID: <1376074332-28674-1-git-send-email-tomascohen@gmail.com>

This patch makes the koha-create script install the file zebra-biblios-dom.cfg
with the proper string substitutions inside on the new instance koha-conf.xml file.

It also adds two option switches that control the indexing mode for the instance:

 --biblio-idx {dom|grs1}
 --auth-idx {dom|grs1}

DOM indexing is set as the default for both authorities and bibliographic records.

Following drojf (thanks!) advise I arranged stuff like explained here:

  http://wiki.koha-community.org/wiki/Switching_to_dom_indexing

To test:
- Apply the patch
- Build your own packages and install them on a test server
a) Create a new instance without using the new switches like:
 $ koha-create --create-db domtest
 - Check there's a file /etc/koha/sites/domtest/zebra-biblios-dom.cfg
 - Check that /etc/koha/sites/domtest/koha-conf.xml points to:
   * zebra-biblios-dom.cfg (biblioserver section)
   * zebra-biblios-dom.cfg (publicserver section)
   * zebra-authorities-dom.cfg (authorityserver section)
 - Success means the new default is DOM
b) Play with the 4 possible combination of option switches
 $ koha-create --create-db --auth-idx grs1 --biblio-idx grs1 domtest
 $ koha-create --create-db --auth-idx grs1 --biblio-idx dom domtest
 $ koha-create --create-db --auth-idx dom --biblio-idx grs1 domtest
 $ koha-create --create-db --auth-idx dom --biblio-idx dom domtest
 - Check the koha-conf.xml file reflects the chosen options.
c) Run
 $ koha-create --help
 - It should advertise this addition accordingly.
d) Run
 $ man koha-create
 - Man page for koha-create should provide good information on the new switches behaviour

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 debian/docs/koha-create.xml                    |   16 ++++
 debian/scripts/koha-create                     |  113 +++++++++++++++++++++++-
 debian/scripts/koha-remove                     |    2 +
 debian/templates/koha-conf-site.xml.in         |   33 +++----
 debian/templates/zebra-biblios-dom-site.cfg.in |   22 ++---
 5 files changed, 158 insertions(+), 28 deletions(-)

diff --git a/debian/docs/koha-create.xml b/debian/docs/koha-create.xml
index 491da62..31c168a 100644
--- a/debian/docs/koha-create.xml
+++ b/debian/docs/koha-create.xml
@@ -27,6 +27,8 @@
       <arg choice="req"><option>--create-db</option>|<option>--request-db</option>|<option>--populate-db</option>|<option>--use-db</option></arg>
       <arg><option>--marcflavor</option> marc21|normarc|unimarc</arg>
       <arg><option>--zebralang</option> en|es|fr|nb|ru|uk</arg>
+      <arg><option>--auth-idx</option> dom|grs1</arg>
+      <arg><option>--biblio-idx</option> dom|grs1</arg>
       <arg><option>--defaultsql</option> /path/to/some.sql</arg>
       <arg><option>--configfile</option> /path/to/config</arg>
       <arg><option>--passwdfile</option> /path/to/passwd</arg>
@@ -109,6 +111,20 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term><option>--auth-idx</option></term>
+      <listitem>
+        <para>Specified the desired indexing mode for authority records. Valid options are <option>dom</option> (default) and <option>grs1</option>.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><option>--biblio-idx</option></term>
+      <listitem>
+        <para>Specified the desired indexing mode for bibliographic records. Valid options are <option>dom</option> (default) and <option>grs1</option>.</para>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
   </refsect1>
 
diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index a0a830a..e8b2578 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # koha-create -- Create a new Koha instance.
 # Copyright 2010  Catalyst IT, Ltd
@@ -22,6 +22,7 @@ set -e
 usage="Usage: $0 [--create-db|--request-db|--populate-db|--use-db] \
     [--marcflavor marc21|normarc|unimarc] \
     [--zebralang en|es|fr|nb|ru|uk] \
+    [--auth-idx dom|grs1] [--biblio-idx dom|grs1] \
     [--defaultsql /path/to/some.sql] \
     [--configfile /path/to/config] [--passwdfile /path/to/passwd] \
     [--database database] [--adminuser n] instancename"
@@ -45,6 +46,14 @@ generate_config_file() {
         -e "s/__ZEBRA_PASS__/$zebrapwd/g" \
         -e "s/__ZEBRA_MARC_FORMAT__/$ZEBRA_MARC_FORMAT/g" \
         -e "s/__ZEBRA_LANGUAGE__/$ZEBRA_LANGUAGE/g" \
+        -e "s/__BIBLIOS_INDEXING_MODE__/$BIBLIOS_INDEXING_MODE/g" \
+        -e "s/__AUTHORITIES_INDEXING_MODE__/$AUTHORITIES_INDEXING_MODE/g" \
+        -e "s/__ZEBRA_BIBLIOS_CFG__/$ZEBRA_BIBLIOS_CFG/g" \
+        -e "s/__ZEBRA_AUTHORITIES_CFG__/$ZEBRA_AUTHORITIES_CFG/g" \
+        -e "s/__START_BIBLIOS_RETRIEVAL_INFO__/`echo $START_BIBLIOS_RETRIEVAL_INFO`/g" \
+        -e "s/__END_BIBLIOS_RETRIEVAL_INFO__/`echo $END_BIBLIOS_RETRIEVAL_INFO`/g" \
+        -e "s/__START_AUTHORITIES_RETRIEVAL_INFO__/`echo $START_AUTHORITIES_RETRIEVAL_INFO`/g" \
+        -e "s/__END_AUTHORITIES_RETRIEVAL_INFO__/`echo $END_AUTHORITIES_RETRIEVAL_INFO`/g" \
         -e "s/__DB_NAME__/$mysqldb/g" \
         -e "s/__DB_HOST__/$mysqlhost/g" \
         -e "s/__DB_USER__/$mysqluser/g" \
@@ -53,6 +62,7 @@ generate_config_file() {
         -e "s/__UNIXGROUP__/$username/g" \
         -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
         "/etc/koha/$1" > "$2"
+
 }
 
 getmysqlhost() {
@@ -75,6 +85,75 @@ getinstancemysqldatabase() {
     xmlstarlet sel -t -v 'yazgfs/config/database' "/etc/koha/sites/$1/koha-conf.xml"
 }
 
+set_biblios_indexing_mode()
+{
+    local indexing_mode=$1
+    local marc_format=$2
+
+    case $indexing_mode in
+        "dom")
+            START_BIBLIOS_RETRIEVAL_INFO=`cat <<EOF
+    <xi:include href="\/etc\/koha\/$marc_format-retrieval-info-bib-dom.xml"\n
+                xmlns:xi="http:\/\/www.w3.org\/2001\/XInclude">\n
+     <xi:fallback>\n
+      <retrievalinfo>
+EOF`
+
+            END_BIBLIOS_RETRIEVAL_INFO=`cat <<EOF
+      <\/retrievalinfo>\n
+     <\/xi:fallback>\n
+    <\/xi:include>
+EOF`
+            BIBLIOS_INDEXING_MODE="dom"
+            ZEBRA_BIBLIOS_CFG="zebra-biblios-dom.cfg"
+            ;;
+        "grs1")
+            START_BIBLIOS_RETRIEVAL_INFO="    <retrievalinfo>"
+            END_BIBLIOS_RETRIEVAL_INFO="    <\/retrievalinfo>"
+            BIBLIOS_INDEXING_MODE="grs1"
+            ZEBRA_BIBLIOS_CFG="zebra-biblios.cfg"
+            ;;
+        *)
+            die "Error: '$indexing_mode' is not a valid indexing mode for bibliographic records."
+            ;;
+    esac
+}
+
+
+set_authorities_indexing_mode()
+{
+    local indexing_mode=$1
+    local marc_format=$2
+
+    case $indexing_mode in
+        "dom")
+            START_AUTHORITIES_RETRIEVAL_INFO=`cat <<EOF
+    <xi:include href="\/etc\/koha\/$marc_format-retrieval-info-auth-dom.xml"\n
+                xmlns:xi="http:\/\/www.w3.org\/2001\/XInclude">\n
+     <xi:fallback>\n
+      <retrievalinfo>
+EOF`
+
+            END_AUTHORITIES_RETRIEVAL_INFO=`cat <<EOF
+      <\/retrievalinfo>\n
+     <\/xi:fallback>\n
+    <\/xi:include>\n
+EOF`
+            AUTHORITIES_INDEXING_MODE="dom"
+            ZEBRA_AUTHORITIES_CFG="zebra-authorities-dom.cfg"
+            ;;
+        "grs1")
+            START_AUTHORITIES_RETRIEVAL_INFO="    <retrievalinfo>"
+            END_AUTHORITIES_RETRIEVAL_INFO="    <\/retrievalinfo>"
+            AUTHORITIES_INDEXING_MODE="grs1"
+            ZEBRA_AUTHORITIES_CFG="zebra-authorities.cfg"
+            ;;
+        *)
+            die "Error: '$indexing_mode' is not a valid indexing mode for authority records."
+            ;;
+    esac
+}
+
 # Set defaults and read config file, if it exists.
 DOMAIN=""
 OPACPORT="80"
@@ -88,6 +167,16 @@ ZEBRA_MARC_FORMAT="marc21"
 ZEBRA_LANGUAGE="en"
 ADMINUSER="1"
 PASSWDFILE="/etc/koha/passwd"
+
+# Indexing mode variables (default is DOM)
+BIBLIOS_INDEXING_MODE="dom"
+AUTHORITIES_INDEXING_MODE="dom"
+
+START_BIBLIOS_RETRIEVAL_INFO=""
+END_BIBLIOS_RETRIEVAL_INFO=""
+START_AUTHORITIES_RETRIEVAL_INFO=""
+END_AUTHORITIES_RETRIEVAL_INFO=""
+
 if [ -e /etc/koha/koha-sites.conf ]
 then
     . /etc/koha/koha-sites.conf
@@ -95,7 +184,7 @@ fi
 
 [ $# -ge 2 ] && [ $# -le 16 ] || die $usage
 
-TEMP=`getopt -o crpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,marcflavor:,zebralang:,defaultsql:,configfile:,passwdfile:,database:,adminuser: \
+TEMP=`getopt -o crpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,marcflavor:,auth-idx:,biblio-idx:,zebralang:,defaultsql:,configfile:,passwdfile:,database:,adminuser: \
      -n "$0" -- "$@"`
 
 # Note the quotes around `$TEMP': they are essential!
@@ -106,6 +195,9 @@ CLO_ZEBRA_MARC_FORMAT=""
 CLO_ZEBRA_LANGUAGE=""
 CLO_DEFAULTSQL=""
 CLO_ADMINUSER=""
+CLO_BIBLIOS_INDEXING_MODE=""
+CLO_AUTHORITIES_INDEXING_MODE=""
+
 
 while true ; do
 	case "$1" in
@@ -115,6 +207,8 @@ while true ; do
         -u|--use-db) op=use ; shift ;;
 		-m|--marcflavor) CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
 		-l|--zebralang) CLO_ZEBRA_LANGUAGE="$2" ; shift 2 ;;
+		--auth-idx) CLO_AUTHORITIES_INDEXING_MODE="$2" ; shift 2 ;;
+		--biblio-idx) CLO_BIBLIOS_INDEXING_MODE="$2" ; shift 2 ;;
 		-d|--defaultsql) CLO_DEFAULTSQL="$2" ; shift 2 ;;
 		-f|--configfile) configfile="$2" ; shift 2 ;;
         -s|--passwdfile) CLO_PASSWDFILE="$2" ; shift 2 ;;
@@ -158,6 +252,19 @@ then
     PASSWDFILE="$CLO_PASSWDFILE"
 fi
 
+if [ "$CLO_BIBLIOS_INDEXING_MODE" !=  "" ]; then
+    BIBLIOS_INDEXING_MODE=$CLO_BIBLIOS_INDEXING_MODE
+fi
+
+set_biblios_indexing_mode $BIBLIOS_INDEXING_MODE $ZEBRA_MARC_FORMAT
+
+
+if [ "$CLO_AUTHORITIES_INDEXING_MODE" !=  "" ]; then
+    AUTHORITIES_INDEXING_MODE=$CLO_AUTHORITIES_INDEXING_MODE
+fi
+
+set_authorities_indexing_mode $AUTHORITIES_INDEXING_MODE $ZEBRA_MARC_FORMAT
+
 name="$1"
 
 opacdomain="$OPACPREFIX$name$OPACSUFFIX$DOMAIN"
@@ -261,6 +368,8 @@ eof
     # Generate and install Zebra config files.
     generate_config_file zebra-biblios-site.cfg.in \
         "/etc/koha/sites/$name/zebra-biblios.cfg"
+    generate_config_file zebra-biblios-dom-site.cfg.in \
+        "/etc/koha/sites/$name/zebra-biblios-dom.cfg"
     generate_config_file zebra-authorities-site.cfg.in \
         "/etc/koha/sites/$name/zebra-authorities.cfg"
     generate_config_file zebra-authorities-dom-site.cfg.in \
diff --git a/debian/scripts/koha-remove b/debian/scripts/koha-remove
index d68aebc..3fa5ef1 100755
--- a/debian/scripts/koha-remove
+++ b/debian/scripts/koha-remove
@@ -74,6 +74,8 @@ eof
         rm "/etc/koha/sites/$name/koha-conf.xml"
     [ -f "/etc/koha/sites/$name/zebra-biblios.cfg" ] && \
         rm "/etc/koha/sites/$name/zebra-biblios.cfg"
+    [ -f "/etc/koha/sites/$name/zebra-biblios-dom.cfg" ] && \
+        rm "/etc/koha/sites/$name/zebra-biblios-dom.cfg"
     [ -f "/etc/koha/sites/$name/zebra-authorities.cfg" ] && \
         rm "/etc/koha/sites/$name/zebra-authorities.cfg"
     [ -f "/etc/koha/sites/$name/zebra-authorities-dom.cfg" ] && \
diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index ab8aff5..80da24a 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -18,7 +18,7 @@
 <listen id="mergeserver">tcp:@:__MERGE_SERVER_PORT__</listen>
 <server id="mergeserver"  listenref="mergeserver">
     <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
-    <config>/var/lib/koha/__KOHASITE__/zebra-biblios.cfg</config>
+    <config>/var/lib/koha/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__</config>
     <cql2rpn>/var/lib/koha/__KOHASITE__/pqf.properties</cql2rpn>
 </server>
 -->
@@ -26,9 +26,10 @@
 <!-- BIBLIOGRAPHIC RECORDS -->
 <server id="biblioserver"  listenref="biblioserver">
     <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
-    <config>/etc/koha/sites/__KOHASITE__/zebra-biblios.cfg</config>
+    <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__</config>
     <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
-     <retrievalinfo>
+
+    __START_BIBLIOS_RETRIEVAL_INFO__
        <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
        <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
        <retrieval syntax="xml" name="F"/>
@@ -75,7 +76,8 @@
            <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
          </backend>
        </retrieval>
-     </retrievalinfo>
+    __END_BIBLIOS_RETRIEVAL_INFO__
+
     <!-- The stuff below is used to enable SRU. It's currently disabled
          until we come up with a good way to make it get magically set up by
          the packaging system. If you need it, uncomment and set it up
@@ -102,12 +104,10 @@
 <!-- AUTHORITY RECORDS -->
 <server id="authorityserver"  listenref="authorityserver" >
     <directory>/var/lib/koha/__KOHASITE__/authorities</directory>
-    <config>/etc/koha/sites/__KOHASITE__/zebra-authorities-dom.cfg</config>
+    <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_AUTHORITIES_CFG__</config>
     <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
-    <xi:include href="/etc/koha/__ZEBRA_MARC_FORMAT__-retrieval-info-auth-dom.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude">
-      <xi:fallback>
-     <retrievalinfo>
+
+    __START_AUTHORITIES_RETRIEVAL_INFO__
        <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
        <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
        <retrieval syntax="xml" name="marcxml"
@@ -145,9 +145,8 @@
            <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
          </backend>
        </retrieval>
-     </retrievalinfo>
-      </xi:fallback>
-    </xi:include>
+    __END_AUTHORITIES_RETRIEVAL_INFO__
+
     <!-- The stuff below is used to enable SRU. It's currently disabled
          until we come up with a good way to make it get magically set up by
          the packaging system. If you need it, uncomment and set it up
@@ -176,9 +175,10 @@
 
 <server id="publicserver"  listenref="publicserver">
     <directory>/var/lib/koha/__KOHASITE__/biblios</directory>
-    <config>/etc/koha/sites/__KOHASITE__/zebra-biblios.cfg</config>
+    <config>/etc/koha/sites/__KOHASITE__/__ZEBRA_BIBLIOS_CFG__</config>
     <cql2rpn>/etc/koha/zebradb/pqf.properties</cql2rpn>
-     <retrievalinfo>
+
+    __START_BIBLIOS_RETRIEVAL_INFO__
        <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="F"/>
        <retrieval syntax="__ZEBRA_MARC_FORMAT__" name="B"/>
        <retrieval syntax="xml" name="F"/>
@@ -225,7 +225,8 @@
            <xslt stylesheet="/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl"/>
          </backend>
        </retrieval>
-     </retrievalinfo>
+    __END_BIBLIOS_RETRIEVAL_INFO__
+
     <xi:include href="__KOHA_CONF_DIR__/zebradb/explain-biblios.xml"
                 xmlns:xi="http://www.w3.org/2001/XInclude">
       <xi:fallback>
@@ -277,6 +278,8 @@
  <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_namespace></memcached_namespace>
+ <zebra_bib_index_mode>__BIBLIOS_INDEXING_MODE__</zebra_bib_index_mode>
+ <zebra_auth_index_mode>__AUTHORITIES_INDEXING_MODE__</zebra_auth_index_mode>
  <queryparser_config>/etc/koha/searchengine/queryparser.yaml</queryparser_config>
 </config>
 
diff --git a/debian/templates/zebra-biblios-dom-site.cfg.in b/debian/templates/zebra-biblios-dom-site.cfg.in
index a748ddd..88d0d6d 100644
--- a/debian/templates/zebra-biblios-dom-site.cfg.in
+++ b/debian/templates/zebra-biblios-dom-site.cfg.in
@@ -3,7 +3,7 @@
 # $Id: zebra.cfg,v 1.1.2.2 2006/05/09 12:03:16 rangi Exp $
 #
 # Where are the config files located?
-profilePath:__ZEBRA_CONF_DIR__/biblios/etc:__ZEBRA_CONF_DIR__/etc:__ZEBRA_CONF_DIR__/marc_defs/__ZEBRA_MARC_FORMAT__/biblios:__ZEBRA_CONF_DIR__/lang_defs/__ZEBRA_LANGUAGE__:__ZEBRA_CONF_DIR__/xsl
+profilePath:/etc/koha/zebradb/biblios/etc:/etc/koha/zebradb/etc:/etc/koha/zebradb/marc_defs/__ZEBRA_MARC_FORMAT__/biblios:/etc/koha/zebradb/lang_defs/__ZEBRA_LANGUAGE__:/etc/koha/zebradb/xsl
 # modulePath - where to look for loadable zebra modules
 modulePath: /usr/lib/idzebra-2.0/modules
 
@@ -21,9 +21,9 @@ attset: gils.att
 # http://www.indexdata.dk/zebra/doc/zebra-cfg.tkl
 # http://www.indexdata.dk/zebra/doc/grs.tkl
 
-recordtype: dom.__ZEBRA_CONF_DIR__/biblios/etc/dom-config.xml
-marcxml.recordtype: dom.__ZEBRA_CONF_DIR__/biblios/etc/dom-config.xml
-iso2709.recordtype: dom.__ZEBRA_CONF_DIR__/biblios/etc/dom-config-marc.xml
+recordtype: dom./etc/koha/zebradb/biblios/etc/dom-config.xml
+marcxml.recordtype: dom./etc/koha/zebradb/biblios/etc/dom-config.xml
+iso2709.recordtype: dom./etc/koha/zebradb/biblios/etc/dom-config-marc.xml
 
 recordId: (bib1,Local-number)
 storeKeys:1
@@ -31,18 +31,18 @@ storeData:1
 
 
 # Lock File Area
-lockDir: __ZEBRA_LOCK_DIR__/biblios
+lockDir: /var/lock/koha/__KOHASITE__/biblios
 perm.anonymous:ar
-perm.__ZEBRA_USER__:rw
-passwd: __ZEBRA_CONF_DIR__/etc/passwd
-register: __ZEBRA_DATA_DIR__/biblios/register:20G
-shadow: __ZEBRA_DATA_DIR__/biblios/shadow:20G
+perm.kohauser:rw
+passwd: /etc/koha/sites/__KOHASITE__/zebra.passwd
+register: /var/lib/koha/__KOHASITE__/biblios/register:20G
+shadow: /var/lib/koha/__KOHASITE__/biblios/shadow:20G
 
 # Temp File area for result sets
-setTmpDir: __ZEBRA_DATA_DIR__/biblios/tmp
+setTmpDir: /var/lib/koha/__KOHASITE__/biblios/tmp
 
 # Temp File area for index program
-keyTmpDir: __ZEBRA_DATA_DIR__/biblios/key
+keyTmpDir: /var/lib/koha/__KOHASITE__/biblios/key
 
 # Approx. Memory usage during indexing
 memMax: 50M
-- 
1.7.9.5


From oleonard at myacpl.org  Mon Aug 12 14:38:55 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 12 Aug 2013 08:38:55 -0400
Subject: [Koha-patches] [PATCH] Bug 10614 - have add order form at top and
	bottom
Message-ID: <1376311136-20073-1-git-send-email-oleonard@myacpl.org>

If a basket has a lot of items it may be inconvenient to scroll to the
bottom of the patch to reach the "add to basket" form. This patch adds
as "Add to basket" button to the toolbar which uses JavaScript to copy
the form into a modal dialog for quick access.

To test, apply the patch and view an open basket. You should be able to
click the "Add to basket" button to trigger a modal dialog with the full
"Add to basket" list of options. All options in the list should function
normally.

If you view a closed basket the new button should not appear.
---
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

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 84df886..8cbc46e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -28,6 +28,11 @@
 
         $("#show_all_details").attr('checked', false);
         updateColumnsVisibility(false);
+        [% UNLESS ( closedate ) %]
+            $('#addtoBasket').on('show', function () {
+               $(this).find(".modal-body").html($("#acqui_basket_add")[0].outerHTML);
+            });
+        [% END %]
     });
 //]]>
 </script>
@@ -137,6 +142,7 @@
         [% UNLESS ( selectbasketg ) %]
             [% UNLESS ( closedate ) %]
                 <div id="toolbar" class="btn-toolbar">
+                    <div class="btn-group"><a href="#addtoBasket" role="button" class="btn btn-small" data-toggle="modal"><i class="icon-plus"></i> Add to basket</a></div>
                     <div class="btn-group"><a href="basketheader.pl?booksellerid=[% booksellerid %]&amp;basketno=[% basketno %]&amp;op=add_form" class="btn btn-small" id="basketheadbutton"><i class="icon-pencil"></i> Edit basket</a></div>
                     <div class="btn-group"><a href="#" class="btn btn-small" id="delbasketbutton"><i class="icon-remove"></i> Delete this basket</a></div>
                     [% IF ( unclosable ) %]
@@ -451,6 +457,15 @@
         [% END %]
         <br />
         [% UNLESS ( closedate ) %]
+
+    <!-- Modal -->
+    <div id="addtoBasket" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel" aria-hidden="true">
+        <div class="modal-body"></div>
+        <div class="modal-footer">
+            <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
+        </div>
+    </div>
+
         [% INCLUDE 'acquisitions-add-to-basket.inc' %]
         [% END %]
         [% END %]
-- 
1.7.9.5

From colin.campbell at ptfs-europe.com  Mon Aug 12 17:47:14 2013
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Mon, 12 Aug 2013 16:47:14 +0100
Subject: [Koha-patches] [PATCH] Bug 10712: Save missing config variables to
	install log
Message-ID: <1376322434-16209-1-git-send-email-colin.campbell@ptfs-europe.com>

The variables for AUTH_INDEX_MODE and ZEBRA_TOKENIZER were not
being saved to the koha_install_log file.
As a result when using the --prev-install-log option in Makefile.PL
the user was still prompted to select these
This patch adds the appropriate variables to the list saved in
the install log
---
 misc/koha-install-log | 2 ++
 rewrite-config.PL     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/misc/koha-install-log b/misc/koha-install-log
index d842484..17dd0da 100644
--- a/misc/koha-install-log
+++ b/misc/koha-install-log
@@ -57,6 +57,8 @@ INSTALL_ZEBRA=__INSTALL_ZEBRA__
 INSTALL_SRU=__INSTALL_SRU__
 INSTALL_PAZPAR2=__INSTALL_PAZPAR2__
 BIB_INDEX_MODE=__BIB_INDEX_MODE__
+AUTH_INDEX_MODE=__AUTH_INDEX_MODE__
+ZEBRA_TOKENIZER=__ZEBRA_TOKENIZER__
 RUN_DATABASE_TESTS=__RUN_DATABASE_TESTS__
 PATH_TO_ZEBRA=__PATH_TO_ZEBRA__
 USE_MEMCACHED=__USE_MEMCACHED__
diff --git a/rewrite-config.PL b/rewrite-config.PL
index 90fd5ff..e903d49 100644
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -122,6 +122,7 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
   '__ZEBRA_RUN_DIR__' => "$prefix/var/run/zebradb",
   '__ZEBRA_MARC_FORMAT__' => 'marc21',
   '__ZEBRA_LANGUAGE__' => 'en',
+  '__ZEBRA_TOKENIZER__' => 'chr',
   '__ZEBRA_TOKENIZER_STMT__' => 'charmap word-phrase-utf.chr',
   '__ZEBRA_AUTH_CFG__' => 'zebra-authorities.cfg',
   '__ZEBRA_BIB_CFG__' => 'zebra-biblios.cfg',
-- 
1.8.4.rc2.15.g96cb27a


From oleonard at myacpl.org  Mon Aug 12 21:13:16 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 12 Aug 2013 15:13:16 -0400
Subject: [Koha-patches] [PATCH] Bug 8324 - Redisplay OPAC list with correct
	sort after edit
Message-ID: <1376334797-24225-1-git-send-email-oleonard@myacpl.org>

If you are viewing the contents of a list, edit it, change the default
sort, and save your list will be redisplayed sorted by title no matter
what default sort you chose. Lists do not automatically sort by their
default sort, they must be opened with the sort parameter.

This patch adds the list's sort parameter to the redirect after editing.

To test, open an existing list in the OPAC which contains items. Click
the "Edit list" link at the top of the list contents view. Change the
default sort to something new. Click "Save." If the list is redisplayed
using the new default sort the patch worked.
---
 C4/VirtualShelves/Page.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index 7756d92..90f0f3f 100644
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -200,7 +200,7 @@ sub shelfpage {
                 }
 
                 if($displaymode eq "viewshelf"){
-                    print $query->redirect( $pages{$type}->{redirect} . "?viewshelf=$shelfnumber" );
+                    print $query->redirect( $pages{$type}->{redirect} . "?viewshelf=$shelfnumber" . "&sortfield=" . $shelf->{sortfield});
                 } elsif($displaymode eq "publicshelves"){
                     print $query->redirect( $pages{$type}->{redirect} );
                 } else {
-- 
1.7.9.5

From oleonard at myacpl.org  Mon Aug 12 21:34:52 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 12 Aug 2013 15:34:52 -0400
Subject: [Koha-patches] [PATCH] Bug 10714 - Redirect to list contents view
	upon save after initiating edit from list contents view
Message-ID: <1376336092-24532-1-git-send-email-oleonard@myacpl.org>

In the staff client, if you initiate a list edit from the list contents
view you should be redirected to that same view after saving your
changes. The OPAC already works this way.

To test, view the contents of an existing list. Click the "Edit list"
item under the "Edit" menu. Click save on the list edit form and you
should be redirected back to the contents view of that list.
---
 .../prog/en/includes/virtualshelves-toolbar.inc    |    2 +-
 .../prog/en/modules/virtualshelves/shelves.tt      |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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 225e5dd..4de9e19 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 @@
         <div class="btn-group">
             <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-pencil"></i> Edit <span class="caret"></span></button>
                 <ul class="dropdown-menu">
-                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?shelfnumber=[% shelfnumber %]&amp;op=modif">Edit list</a></li>
+                    <li><a href="/cgi-bin/koha/virtualshelves/shelves.pl?shelfnumber=[% shelfnumber %]&amp;op=modif&amp;display=viewshelf">Edit list</a></li>
                     [% IF ( showprivateshelves ) %]
                         <li><a id="deleteshelf" href="/cgi-bin/koha/virtualshelves/shelves.pl?display=privateshelves&amp;shelves=1&amp;DEL-[% shelfnumber %]=1">Delete list</a></li>
                     [% ELSE %]
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 aac163f..4c51b34 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt
@@ -467,6 +467,7 @@ function placeHold () {
 
     [% IF ( edit ) %]
 		<input type="hidden" name="op" value="modifsave" />
+        <input type="hidden" name="display" value="[% display %]" />
         [% IF ( showprivateshelves ) %]<input type="hidden" name="display" value="privateshelves" />[% END %]
 		<input type="hidden" name="shelfnumber" value="[% shelfnumber %]" />
         <legend>Edit list <i>[% shelfname | html %]</i></legend>
-- 
1.7.9.5

From oleonard at myacpl.org  Tue Aug 13 16:13:44 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 13 Aug 2013 10:13:44 -0400
Subject: [Koha-patches] [PATCH] Bug 9238 - fund pull down says 'select
	budget'
Message-ID: <1376403225-25901-1-git-send-email-oleonard@myacpl.org>

When adding a new order to a basket the fund selection field is labeled
"Fund:" but the default option is "Select a budget." This patch changes
this string to "Select a fund" and also corrects the associated
JavaScript error message text displayed when one doesn't choose a fund.

To test, add an order to basket. The "New order" form should show
"Select a fund" as the default option for "Fund" in the "Accounting
details" section. If you submit the form without selecting a fund the
error message should read "You must select a fund."
---
 .../prog/en/modules/acqui/neworderempty.tt         |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 52def80..da8f88a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -40,7 +40,7 @@ function Check(ff) {
     
     if(isNull(ff.budget_id,1)){
 		ok=1;
-					_alertString += "\n- "+ _("You must select a budget");
+        _alertString += "\n- "+ _("You must select a fund");
     }
 
     if (!(isNum(ff.quantity,0)) || ff.quantity.value == 0){
@@ -383,7 +383,7 @@ $(document).ready(function()
       [% END %][%# UNLESS subscriptionid %]
     [% END %][%# IF (AcqCreateItemOrdering) %]
     <fieldset class="rows">
-        <legend>Accounting Details</legend>
+        <legend>Accounting details</legend>
         <ol>
             <li>
                 [% IF ( close ) %]
@@ -415,7 +415,7 @@ $(document).ready(function()
                 [% ELSE %]
                 <label class="required" for="budget_id">Fund: </label>
                 <select id="budget_id" onchange="fetchSortDropbox(this.form)" size="1" name="budget_id">
-                        <option value="">Select a budget</option>
+                        <option value="">Select a fund</option>
                 [% FOREACH budget_loo IN budget_loop %]
                     [% IF ( budget_loo.b_sel ) %]
                         <option value="[% budget_loo.b_id %]" selected="selected">[% budget_loo.b_txt %]</option>
-- 
1.7.9.5

From oleonard at myacpl.org  Tue Aug 13 18:40:51 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 13 Aug 2013 12:40:51 -0400
Subject: [Koha-patches] [PATCH] Bug 10081 - IndependentBranches error
	message missing the library name
Message-ID: <1376412051-27317-1-git-send-email-oleonard@myacpl.org>

With IndependentBranches turned on, if you try to check out an item
which belongs to another library you will get an error message which is
missing the library name. This patch corrects the problem by passing the
necessary variable to the template and outputting the library name using
the KohaBranchName TT plugin.

To test, turn on IndependentBranches and try to check out an item
belonging to another library (note that you must test with a staff user
who is not a superlibrarian). The error message you see should include
the name of the library to which the item belongs:

"This item belongs to Nelsonville and cannot be checked out from this
location."

Checkouts of items belonging to the library should be unaffected.
---
 C4/Circulation.pm                                  |    6 ++++--
 .../prog/en/modules/circ/circulation.tt            |    3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index ca66931..95414eb 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -896,8 +896,10 @@ sub CanBookBeIssued {
     if ( C4::Context->preference("IndependentBranches") ) {
         my $userenv = C4::Context->userenv;
         if ( ($userenv) && ( $userenv->{flags} % 2 != 1 ) ) {
-            $issuingimpossible{ITEMNOTSAMEBRANCH} = 1
-              if ( $item->{C4::Context->preference("HomeOrHoldingBranch")} ne $userenv->{branch} );
+            if ( $item->{C4::Context->preference("HomeOrHoldingBranch")} ne $userenv->{branch} ){
+                $issuingimpossible{ITEMNOTSAMEBRANCH} = 1;
+                $issuingimpossible{'itemhomebranch'} = $item->{C4::Context->preference("HomeOrHoldingBranch")};
+            }
             $needsconfirmation{BORRNOTSAMEBRANCH} = GetBranchName( $borrower->{'branchcode'} )
               if ( $borrower->{'branchcode'} ne $userenv->{branch} );
         }
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 f93ae74..f19a8af 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -1,3 +1,4 @@
+[% USE KohaBranchName %]
 [% USE KohaDates %]
 [% IF ( export_remove_fields OR export_with_csv_profile ) %]
    [% SET exports_enabled = 1 %]
@@ -546,7 +547,7 @@ function validate1(date) {
         [% END %]
 
         [% IF ( ITEMNOTSAMEBRANCH ) %]
-            <li>This item belongs to [% itemhomebranch %] and cannot be issued from this location.</li>
+            <li>This item belongs to [% itemhomebranch | $KohaBranchName %] and cannot be checked out from this location.</li>
         [% END %]
 
         [% IF ( USERBLOCKEDREMAINING ) %]
-- 
1.7.9.5

From oleonard at myacpl.org  Tue Aug 13 20:57:51 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 13 Aug 2013 14:57:51 -0400
Subject: [Koha-patches] [PATCH] Bug 10721 - Improve DataTables configuration
	on transfers to receive report
Message-ID: <1376420272-27853-1-git-send-email-oleonard@myacpl.org>

I noticed this template used a hidden span to allow correct sorting of
titles--a relic of the previous table sorting plugin. I have removed
that and added an improved DataTables configuration.

To test apply the patch and view the transfers to receive report for a
library which has multiple transfers to receive. Sorting should work
correctly on all columns, including correct date sorting regardless of
dateformat system preference. Title sorting should correctly exclude
articles.
---
 circ/transferstoreceive.pl                         |    2 +-
 .../prog/en/modules/circ/transferstoreceive.tt     |   10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl
index a037726..224df58 100755
--- a/circ/transferstoreceive.pl
+++ b/circ/transferstoreceive.pl
@@ -89,7 +89,7 @@ foreach my $br ( keys %$branches ) {
             my $gettitle     = GetBiblioFromItemNumber( $num->{'itemnumber'} );
             my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $gettitle->{'itype'} : $gettitle->{'itemtype'} );
 
-            $getransf{'datetransfer'} = format_date( $num->{'datesent'} );
+            $getransf{'datetransfer'} = $num->{'datesent'};
             $getransf{'itemtype'} = $itemtypeinfo ->{'description'};
 			foreach (qw(title author biblionumber itemnumber barcode homebranch holdingbranch itemcallnumber)) {
             	$getransf{$_} = $gettitle->{$_};
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
index a335f98..d0286ca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
@@ -1,3 +1,4 @@
+[% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Circulation &rsaquo; Transfers to your library</title>
 [% INCLUDE 'doc-head-close.inc' %]
@@ -16,6 +17,9 @@ $(document).ready(function() {
         "aoColumnDefs": [
             { "aTargets": [ -1 ], "bSortable": false, "bSearchable": false },
         ],
+        "aoColumns": [
+            { "sType": "title-string" },{ "sType": "anti-the" },null,null,null,null
+        ],
         "sDom": 't',
         "bPaginate": false
     }));
@@ -59,9 +63,9 @@ $(document).ready(function() {
                 [% ELSE %]
                 <tr>
                 [% END %]
-                    <td><p>[% reser.datetransfer %]</p> [% IF ( reser.messcompa ) %]<span class="error">Transfer is [% reser.diff %] days late</span>[% END %]</td>
-                    <td><span style="display:none;">[% reser.title |html %]</span><!-- invisible title for tablesorter -->
-                   [% INCLUDE 'biblio-default-view.inc' biblionumber = reser.biblionumber %][% reser.title |html %] [% IF ( reser.subtitle ) %] [% FOREACH subtitl IN reser.subtitle %][% subtitl.subfield %][% END %][% END %]</a> [% IF ( reser.author ) %]by [% reser.author %][% END %]
+                    <td><p><span title="[% reser.datetransfer %]">[% reser.datetransfer | $KohaDates %]</span></p> [% IF ( reser.messcompa ) %]<span class="error">Transfer is [% reser.diff %] days late</span>[% END %]</td>
+                    <td>
+                        [% INCLUDE 'biblio-default-view.inc' biblionumber = reser.biblionumber %][% reser.title |html %] [% IF ( reser.subtitle ) %] [% FOREACH subtitl IN reser.subtitle %][% subtitl.subfield %][% END %][% END %]</a> [% IF ( reser.author ) %]by [% reser.author %][% END %]
                             [% IF ( reser.itemtype ) %]&nbsp; (<b>[% reser.itemtype %]</b>)[% END %]
                             <br />Barcode: [% reser.barcode %]
                     </td>
-- 
1.7.9.5

From colin.campbell at ptfs-europe.com  Wed Aug 14 16:54:23 2013
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Wed, 14 Aug 2013 15:54:23 +0100
Subject: [Koha-patches] [PATCH] Bug 10728 Dont issue warning because mode is
	not defined
Message-ID: <1376492063-10625-1-git-send-email-colin.campbell@ptfs-europe.com>

error log is showing warnings because mode is undefined
and we are doing string comparisons on it
Set it to a default value ( we were already assigning it a variable
which we were not using ) and use the the result in the comparison
---
 serials/subscription-renew.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/serials/subscription-renew.pl b/serials/subscription-renew.pl
index 48861bc..47b35f0 100755
--- a/serials/subscription-renew.pl
+++ b/serials/subscription-renew.pl
@@ -59,7 +59,7 @@ use C4::Serials;
 my $query = new CGI;
 my $dbh   = C4::Context->dbh;
 
-my $mode           = $query->param('mode');
+my $mode           = $query->param('mode') || q{};
 my $op             = $query->param('op') || q{};
 my $subscriptionid = $query->param('subscriptionid');
 my $done = 0;    # for after form has been submitted
@@ -99,7 +99,7 @@ $template->param(
     subscriptionid => $subscriptionid,
     bibliotitle    => $subscription->{bibliotitle},
     $op            => 1,
-    popup          => ($query->param('mode')eq "popup"),
+    popup          => ($mode eq 'popup'),
 );
 
 # Print the page
-- 
1.8.4.rc2.15.g96cb27a


From colin.campbell at ptfs-europe.com  Wed Aug 14 17:36:42 2013
From: colin.campbell at ptfs-europe.com (Colin Campbell)
Date: Wed, 14 Aug 2013 16:36:42 +0100
Subject: [Koha-patches] [PATCH] bug 10729 Add phrases configuration for icu
Message-ID: <1376494602-11410-1-git-send-email-colin.campbell@ptfs-europe.com>

Add a separate phrases-icu.xml for phrase indexes
The file is based on that distributed with zebra
with a couple of additions to reflect Koha usage

This patch adds a separate tokenizer variable
for phrase indexes so that default.idx is
correctly rewritten for sites using icu
indexing
---
 Makefile.PL                     |  4 ++++
 etc/zebradb/etc/default.idx     |  2 +-
 etc/zebradb/etc/phrases-icu.xml | 10 ++++++++++
 rewrite-config.PL               |  1 +
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 etc/zebradb/etc/phrases-icu.xml

diff --git a/Makefile.PL b/Makefile.PL
index a61072f..8340e8f 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -558,6 +558,10 @@ $config{ZEBRA_TOKENIZER_STMT} = $config{ZEBRA_TOKENIZER} eq 'icu'
     ? 'icuchain words-icu.xml'
     : 'charmap word-phrase-utf.chr';
 
+$config{ZEBRA_PTOKENIZER_STMT} = $config{ZEBRA_TOKENIZER} eq 'icu'
+    ? 'icuchain phrases-icu.xml'
+    : 'charmap word-phrase-utf.chr';
+
 my %test_suite_override_dirs = (
     KOHA_CONF_DIR  => ['etc'],
     ZEBRA_CONF_DIR => ['etc', 'zebradb'],
diff --git a/etc/zebradb/etc/default.idx b/etc/zebradb/etc/default.idx
index d6314c6..3a70392 100644
--- a/etc/zebradb/etc/default.idx
+++ b/etc/zebradb/etc/default.idx
@@ -18,7 +18,7 @@ __ZEBRA_TOKENIZER_STMT__
 index p
 completeness 1
 firstinfield 1
-__ZEBRA_TOKENIZER_STMT__
+__ZEBRA_PTOKENIZER_STMT__
 
 # URX (URL) index
 # Used if structure=urx (@attr 4=104)
diff --git a/etc/zebradb/etc/phrases-icu.xml b/etc/zebradb/etc/phrases-icu.xml
new file mode 100644
index 0000000..59d415c
--- /dev/null
+++ b/etc/zebradb/etc/phrases-icu.xml
@@ -0,0 +1,10 @@
+<icu_chain locale="">
+  <transform rule="[:Control:] Any-Remove"/>
+  <tokenize rule="s"/>
+  <transform rule="[: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 e903d49..f53d402 100644
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -124,6 +124,7 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
   '__ZEBRA_LANGUAGE__' => 'en',
   '__ZEBRA_TOKENIZER__' => 'chr',
   '__ZEBRA_TOKENIZER_STMT__' => 'charmap word-phrase-utf.chr',
+  '__ZEBRA_PTOKENIZER_STMT__' => 'charmap word-phrase-utf.chr',
   '__ZEBRA_AUTH_CFG__' => 'zebra-authorities.cfg',
   '__ZEBRA_BIB_CFG__' => 'zebra-biblios.cfg',
   '__AUTH_RETRIEVAL_CFG__' => 'retrieval-info-auth-grs1.xml',
-- 
1.8.4.rc2.15.g96cb27a


From tomascohen at gmail.com  Wed Aug 14 21:56:40 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Wed, 14 Aug 2013 16:56:40 -0300
Subject: [Koha-patches] [PATCH] Bug 10733 - Memcached on package installs
Message-ID: <1376510200-31938-1-git-send-email-tomascohen@gmail.com>

This patch makes the koha-create script adjust the koha-conf.xml file
with the proper string substitutions to enable the use of memcached
for the created Koha instance.

It adds three option switches that control this:

 --use-memcached (defaults to "no")
 --memcached-servers "host1:port1,..." (defaults to 127.0.0.1:11211)
 --memcached-namespace "desired_namespace" (defaults to koha_${instance})

Note: the docs discourage setting user's own namespace.

Using memcached is off as the default. The relevant configuration variables will remain empty
if the user doesn't pass --use-memcached to the command. It matches the current behaviour.

To test:
- Apply the patch
- Build your own packages and install them on a test server
a) Create a new instance without using the new switches like:
 $ koha-create --create-db memctest
 - Check that /etc/koha/sites/memctest/koha-conf.xml contains:
   * Empty <memcached_servers> tag.
   * Empty <memcached_namespace> tag.
b) Play with the possible combination of option switches
(Note that the code defaults to empty and will remain like that if --use-memcached is not
used, so less tests...)
 $ koha-create --create-db --use-memcached memctest
 $ koha-create --create-db --use-memcached --memcached-servers "anything:xxx" memctest
 $ koha-create --create-db --use-memcached --memcached-servers "anything:xxx" --memcached-namespace "something" memctest
 $ koha-create --create-db --use-memcached --memcached-namespace "something" memctest
 - Check the koha-conf.xml file reflects the chosen options.
c) Run
 $ koha-create --help
 - It should advertise this addition accordingly.
d) Run
 $ man koha-create
 - Man page for koha-create should provide good information on the new switches behaviour

Enjoy
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 debian/control.in                      |    3 ++-
 debian/docs/koha-create.xml            |   24 +++++++++++++++++
 debian/scripts/koha-create             |   45 ++++++++++++++++++++++++++++++--
 debian/templates/apache-site.conf.in   |    4 +++
 debian/templates/koha-conf-site.xml.in |    4 +--
 5 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/debian/control.in b/debian/control.in
index e2b8882..c3d463f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -32,7 +32,8 @@ Depends: ${misc:Depends}, ${koha:Depends},
  unzip,
  xmlstarlet,
  yaz
-Suggests: mysql-server
+Suggests: mysql-server,
+ memcached
 Homepage: http://koha-community.org/
 Description: integrated (physical) library management system
  Koha is an Integrated Library Managment system for real-world libraries
diff --git a/debian/docs/koha-create.xml b/debian/docs/koha-create.xml
index 31c168a..0781fd3 100644
--- a/debian/docs/koha-create.xml
+++ b/debian/docs/koha-create.xml
@@ -29,6 +29,9 @@
       <arg><option>--zebralang</option> en|es|fr|nb|ru|uk</arg>
       <arg><option>--auth-idx</option> dom|grs1</arg>
       <arg><option>--biblio-idx</option> dom|grs1</arg>
+      <arg><option>--use-memcached</option></arg>
+      <arg><option>--memcached-servers</option> server:port</arg>
+      <arg><option>--memcached-namespace</option> koha_namespace</arg>
       <arg><option>--defaultsql</option> /path/to/some.sql</arg>
       <arg><option>--configfile</option> /path/to/config</arg>
       <arg><option>--passwdfile</option> /path/to/passwd</arg>
@@ -125,6 +128,27 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term><option>--use-memcached</option></term>
+      <listitem>
+        <para>Make the Koha instance use memcached. <option>Disabled by default</option>.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><option>--memcached-servers</option></term>
+      <listitem>
+        <para>Specify a comma-separated list of host:port memcached servers for using with the created Koha instance. Defaults to <option>127.0.0.1:11211</option>, the needed configuration for a locally installed memcached server.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><option>--memcached-namespace</option></term>
+      <listitem>
+        <para>Specifiy a memcached <option>namespace</option> for the created Koha instance. You usually leave this option alone to avoid namespace collisions. It defaults to <option>koha_instance</option>.</para>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
   </refsect1>
 
diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index e8b2578..bcfadc9 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -61,6 +61,8 @@ generate_config_file() {
         -e "s/__UNIXUSER__/$username/g" \
         -e "s/__UNIXGROUP__/$username/g" \
         -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
+        -e "s/__MEMCACHED_NAMESPACE__/$MEMCACHED_NAMESPACE/g" \
+        -e "s/__MEMCACHED_SERVERS__/$MEMCACHED_SERVERS/g" \
         "/etc/koha/$1" > "$2"
 
 }
@@ -154,6 +156,26 @@ EOF`
     esac
 }
 
+
+set_memcached()
+{
+    local instance="$1"
+
+    if [ "$CLO_MEMCACHED_SERVERS" != "" ]; then
+        MEMCACHED_SERVERS=$CLO_MEMCACHED_SERVERS
+    else
+        MEMCACHED_SERVERS=$DEFAULT_MEMCACHED_SERVERS
+    fi
+
+    if [ "$CLO_MEMCACHED_NAMESPACE" != "" ]; then
+        MEMCACHED_NAMESPACE=$CLO_MEMCACHED_NAMESPACE
+    else
+        # default
+        MEMCACHED_NAMESPACE="koha_$instance"
+    fi
+
+}
+
 # Set defaults and read config file, if it exists.
 DOMAIN=""
 OPACPORT="80"
@@ -167,6 +189,10 @@ ZEBRA_MARC_FORMAT="marc21"
 ZEBRA_LANGUAGE="en"
 ADMINUSER="1"
 PASSWDFILE="/etc/koha/passwd"
+USE_MEMCACHED="no"
+MEMCACHED_SERVERS=""
+MEMCACHED_NAMESPACE=""
+DEFAULT_MEMCACHED_SERVERS="127.0.0.1:11211"
 
 # Indexing mode variables (default is DOM)
 BIBLIOS_INDEXING_MODE="dom"
@@ -184,7 +210,7 @@ fi
 
 [ $# -ge 2 ] && [ $# -le 16 ] || die $usage
 
-TEMP=`getopt -o crpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,marcflavor:,auth-idx:,biblio-idx:,zebralang:,defaultsql:,configfile:,passwdfile:,database:,adminuser: \
+TEMP=`getopt -o crpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,use-memcached,marcflavor:,auth-idx:,biblio-idx:,zebralang:,defaultsql:,configfile:,passwdfile:,database:,adminuser:,memcached-servers:,memcached-namespace:, \
      -n "$0" -- "$@"`
 
 # Note the quotes around `$TEMP': they are essential!
@@ -197,6 +223,8 @@ CLO_DEFAULTSQL=""
 CLO_ADMINUSER=""
 CLO_BIBLIOS_INDEXING_MODE=""
 CLO_AUTHORITIES_INDEXING_MODE=""
+CLO_MEMCACHED_SERVERS=""
+CLO_MEMCACHED_NAMESPACE=""
 
 
 while true ; do
@@ -204,7 +232,16 @@ while true ; do
 		-c|--create-db) op=create ; shift ;;
 		-r|--request-db) op=request ; shift ;;
 		-p|--populate-db) op=populate ; shift ;;
-        -u|--use-db) op=use ; shift ;;
+            -u|--use-db) op=use ; shift ;;
+            --use-memcached)
+                USE_MEMCACHED="yes"
+                shift ;;
+            --memcached-servers)
+                CLO_MEMCACHED_SERVERS="$2"
+                shift 2 ;;
+            --memcached-namespace)
+                CLO_MEMCACHED_NAMESPACE="$2"
+                shift 2;;
 		-m|--marcflavor) CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
 		-l|--zebralang) CLO_ZEBRA_LANGUAGE="$2" ; shift 2 ;;
 		--auth-idx) CLO_AUTHORITIES_INDEXING_MODE="$2" ; shift 2 ;;
@@ -267,6 +304,10 @@ set_authorities_indexing_mode $AUTHORITIES_INDEXING_MODE $ZEBRA_MARC_FORMAT
 
 name="$1"
 
+if [ "$USE_MEMCACHED" = "yes" ]; then
+    set_memcached $name
+fi
+
 opacdomain="$OPACPREFIX$name$OPACSUFFIX$DOMAIN"
 intradomain="$INTRAPREFIX$name$INTRASUFFIX$DOMAIN"
 
diff --git a/debian/templates/apache-site.conf.in b/debian/templates/apache-site.conf.in
index 42bdbcd..886d656 100644
--- a/debian/templates/apache-site.conf.in
+++ b/debian/templates/apache-site.conf.in
@@ -9,6 +9,8 @@
    ServerName __OPACSERVER__
    SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
    AssignUserID __UNIXUSER__ __UNIXGROUP__
+   SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
+   SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
 
    ErrorLog    /var/log/koha/__KOHASITE__/opac-error.log
 #  TransferLog /var/log/koha/__KOHASITE__/opac-access.log
@@ -24,6 +26,8 @@
    ServerName __INTRASERVER__
    SetEnv KOHA_CONF "/etc/koha/sites/__KOHASITE__/koha-conf.xml"
    AssignUserID __UNIXUSER__ __UNIXGROUP__
+   SetEnv MEMCACHED_SERVERS "__MEMCACHED_SERVERS__"
+   SetEnv MEMCACHED_NAMESPACE "__MEMCACHED_NAMESPACE__"
 
    ErrorLog    /var/log/koha/__KOHASITE__/intranet-error.log
 #  TransferLog /var/log/koha/__KOHASITE__/intranet-access.log
diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 71de9fb..9bf090b 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -276,8 +276,8 @@
  <!-- <pazpar2url>http://__PAZPAR2_HOST__:__PAZPAR2_PORT__/search.pz2</pazpar2url> -->
  <install_log>/usr/share/koha/misc/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_namespace></memcached_namespace>
+ <memcached_servers>__MEMCACHED_SERVERS__</memcached_servers>
+ <memcached_namespace>__MEMCACHED_NAMESPACE__</memcached_namespace>
  <zebra_bib_index_mode>__BIBLIOS_INDEXING_MODE__</zebra_bib_index_mode>
  <zebra_auth_index_mode>__AUTHORITIES_INDEXING_MODE__</zebra_auth_index_mode>
  <queryparser_config>/etc/koha/searchengine/queryparser.yaml</queryparser_config>
-- 
1.7.9.5


From oleonard at myacpl.org  Wed Aug 14 22:10:29 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 14 Aug 2013 16:10:29 -0400
Subject: [Koha-patches] =?utf-8?q?=5BPATCH=5D_Bug_9782_-_Cancel_button_doe?=
	=?utf-8?q?sn=27t_work_when_importing_MARC_bibliographic_frameworks?=
Message-ID: <1376511030-8584-1-git-send-email-oleonard@myacpl.org>

When importing frameworks the "cancel" button should be hidden once an
import is initiated since it is not possible to cancel the import in
progress.

This patch uses this bug as an excuse to replace the old import/export
pop-ups with modal dialogs for all import/export functions.

To test:

- Try exporting both the default framework and at least one other
  framework.
- Try importing both a default framework and at least one other
  framework.
- When importing, observe that the modal dialog controls are hidden as
  soon as the import is initiated.
---
 .../intranet-tmpl/prog/en/css/staff-global.css     |    3 +
 .../prog/en/modules/admin/biblio_framework.tt      |  155 ++++++++++++--------
 2 files changed, 99 insertions(+), 59 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 e792cab..22b7595 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -2392,7 +2392,10 @@ video {
 /* Bootstrap overrides */
 .btn {
     border-color : #ADADAD #ADADAD #949494;
+}
 
+.btn.btn-link {
+    border : 0;
 }
 
 .btn-small .caret {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
index aa269ce..50faf31 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/biblio_framework.tt
@@ -84,7 +84,7 @@ function Check(f) {
             }
         });
         $('form.form_export').submit(function() {
-            $('.import_export_options').hide();
+            $('.modal').modal("hide");
             return true;
         });
         $('form.form_import').submit(function() {
@@ -93,7 +93,7 @@ function Check(f) {
             if (/(?:\.csv|\.sql|\.ods|\.xml)$/.test(obj.val())) {
                 if (confirm(_("Do you really want to import the framework fields and subfields? This will overwrite the current configuration. For safety reasons please use the export option to make a backup"))) {
                     var frameworkcode = $('#' + id + ' input:hidden[name=frameworkcode]').val();
-                    $('#importing_' + frameworkcode).find("span").html(_("Importing to framework:")+"<strong>" + frameworkcode + "</strong><br />" +_("Importing from file:")+"<i>" + obj.val().replace(new RegExp("^.+[/\\\\]"),"") + "</i>");
+                    $('#importing_' + frameworkcode).find("span").html(_("Importing to framework:")+"<strong>" + frameworkcode + "</strong>. " +_("Importing from file:")+"<i>" + obj.val().replace(new RegExp("^.+[/\\\\]"),"") + "</i>");
                     if (navigator.userAgent.toLowerCase().indexOf('msie') != -1) {
                         var timestamp = new Date().getTime();
                         $('#importing_' + frameworkcode).find("img").attr('src', '[% interface %]/[% theme %]/img/loading-small.gif' + '?' +timestamp);
@@ -101,6 +101,7 @@ function Check(f) {
                     $('#importing_' + frameworkcode).css('display', 'block');
                     if (navigator.userAgent.toLowerCase().indexOf('firefox') == -1) $("body").css("cursor", "progress");
                     importing = true;
+                    $(".modal-footer,.closebtn").hide();
                     return true;
                 } else
                     return false;
@@ -192,40 +193,59 @@ function Check(f) {
         <td><a href="marctagstructure.pl?frameworkcode=[% frameworkcode %]">MARC structure</a></td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
-        <td><div class="import_export"><a class="import_export_fw" href="#" title="Export [% frameworkcode %] framework structure (fields, subfields) to a spreadsheet file (.csv, .xml, .ods) or SQL file">Export</a>
-            <div class="import_export_options">
+        <td>
+
+            <!-- Button to trigger modal -->
+            <a href="#" data-toggle="modal" data-target="#exportModal_[% frameworkcode %]">Export</a>
+            <!-- Modal -->
+            <div class="modal hide" id="exportModal_[% frameworkcode %]" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_[% frameworkcode %]" aria-hidden="true">
+                <div class="modal-header">
+                    <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">?</button>
+                    <h3 id="exportLabelexportModal_[% frameworkcode %]">Export default framework</h3>
+                </div>
                 <form action="import_export_framework.pl" name="form_[% frameworkcode %]" method="get" target="_blank"  class="form_export">
-                    <fieldset class="rows">
-                    <legend>Export framework</legend>
-                    <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
-                    <ol>
-                        <li><label for="csv_type_export_[% frameworkcode %]">Export to CSV spreadsheet</label><input type="radio" name="type_export_[% frameworkcode %]" value="csv" id="csv_type_export_[% frameworkcode %]" checked="checked" /></li>
-                        <li><label for="xml_type_export_[% frameworkcode %]">Export to Excel with XML format, compatible with OpenOffice/LibreOffice as well</label><input type="radio" name="type_export_[% frameworkcode %]" value="excel" id="xml_type_export_[% frameworkcode %]" /></li>
-                        <li><label for="ods_type_export_[% frameworkcode %]">Export to OpenDocument spreadsheet format</label><input type="radio" name="type_export_[% frameworkcode %]" value="ods" id="ods_type_export_[% frameworkcode %]" /></li>
-                        <li><label for="sql_type_export_[% frameworkcode %]">Export to SQL</label><input type="radio" name="type_export_[% frameworkcode %]" value="sql" id="sql_type_export_[% frameworkcode %]" /></li>
-                    </ol>
-                    </fieldset>
-                    <fieldset class="action"><input type="submit" href="#" value="Export" title="Export to a spreadsheet" /> <a href="#" class="import_export_close cancel">Cancel</a> </fieldset>
+                    <div class="modal-body">
+                        <fieldset>
+                            <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
+                            <p><label for="csv_type_export_[% frameworkcode %]"><input type="radio" name="type_export_[% frameworkcode %]" value="csv" id="csv_type_export_[% frameworkcode %]" checked="checked" /> Export to CSV spreadsheet</label></p>
+                            <p><label for="xml_type_export_[% frameworkcode %]"><input type="radio" name="type_export_[% frameworkcode %]" value="excel" id="xml_type_export_[% frameworkcode %]" /> Export to Excel with XML format, compatible with OpenOffice/LibreOffice as well</label></p>
+                            <p><label for="ods_type_export_[% frameworkcode %]"><input type="radio" name="type_export_[% frameworkcode %]" value="ods" id="ods_type_export_[% frameworkcode %]" /> Export to OpenDocument spreadsheet format</label></p>
+                            <p><label for="sql_type_export_[% frameworkcode %]"><input type="radio" name="type_export_[% frameworkcode %]" value="sql" id="sql_type_export_[% frameworkcode %]" /> Export to SQL</label></p>
+
+                        </fieldset>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="submit" class="btn">Export</button>
+                        <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                    </div>
                 </form>
             </div>
-            </div>
+
         </td>
-        <td><div class="import_export"><a href="#" class="import_export_fw" title="Import [% frameworkcode %] framework structure (fields, subfields) from a spreadsheet file (.csv, .xml, .ods) or SQL file">Import</a>
-            <div class="import_export_options">
+        <td>
+
+            <!-- Button to trigger modal -->
+            <a href="#" data-toggle="modal" data-target="#importModal_[% frameworkcode %][% loop.count %]">Import</a>
+            <!-- Modal -->
+            <div class="modal hide" id="importModal_[% frameworkcode %][% loop.count %]" tabindex="-1" role="dialog" aria-labelledby="importLabelexportModal_[% frameworkcode %][% loop.count %]" aria-hidden="true">
+                <div class="modal-header">
+                    <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">?</button>
+                    <h3 id="importLabelexportModal_[% frameworkcode %][% loop.count %]">Import default framework structure (fields and subfields) from a spreadsheet file (.csv, .xml, .ods) or SQL file</h3>
+                </div>
                 <form action="/cgi-bin/koha/admin/import_export_framework.pl" name="form_i_[% frameworkcode %]" id="form_i_[% frameworkcode %]" method="post" enctype="multipart/form-data" class="form_import">
-                    <fieldset class="rows">
-                    <legend>Import [% frameworkcode %] framework structure (fields and subfields) from a spreadsheet file (.csv, .xml, .ods) or SQL file</legend>
-                    <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
-                    <input type="hidden" name="action" value="import" />
-                    <ol>
-                        <li><label for="d_file_import_[% frameworkcode %]">Upload file:</label><input type="file" name="file_import_[% frameworkcode %]" id="d_file_import_[% frameworkcode %]" class="input_import" value="" autocomplete="off" /></li>
-                        <li><div id="importing_[% frameworkcode %]" style="display:none" class="importing"><img src="[% interface %]/[% theme %]/img/loading-small.gif" /><span class="importing_msg"></span></div></li>
-                    </ol>
-                    </fieldset>
-                    <fieldset class="action"><input type="submit" value="Import" /> <a href="#" class="import_export_close cancel">Cancel</a> </fieldset>
+                    <div class="modal-body">
+                            <input type="hidden" name="frameworkcode" value="[% frameworkcode %]" />
+                            <input type="hidden" name="action" value="import" />
+                            <p><label for="file_import_[% frameworkcode %]">Upload file:</label> <input type="file" name="file_import_[% frameworkcode %]" id="file_import_[% frameworkcode %]" class="input_import" /></p>
+                            <div id="importing_[% frameworkcode %]" style="display:none" class="importing"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /><span class="importing_msg"></span></div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="submit" class="btn">Import</button>
+                        <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button>
+                    </div>
                 </form>
             </div>
-            </div>
+
         </td>
     </tr>
     <!-- note highlight assignment appears backwards because we already have a normal row for Default -->
@@ -239,39 +259,56 @@ function Check(f) {
             <td><a href="[% loo.script_name %]?op=add_form&amp;frameworkcode=[% loo.frameworkcode |html %]">Edit</a></td>
             <td><a href="[% loo.script_name %]?op=delete_confirm&amp;frameworkcode=[% loo.frameworkcode |html %]">Delete</a></td>
             <td>
-            <div class="import_export"><a class="import_export_fw" href="#" title="Export [% loo.frameworkcode %] framework structure (fields and subfields) to a spreadsheet file (.csv, .xml, .ods) or SQL file">Export</a>
-                <div class="import_export_options">
-                    <form action="import_export_framework.pl" name="form_[% loo.frameworkcode %]" method="get" target="_blank" class="form_export">
-                        <fieldset class="rows">
-                        <legend>Export framework</legend>
-                        <input type="hidden" name="frameworkcode" value="[% loo.frameworkcode %]" />
-                        <ol>
-                            <li><label for="csv_type_export_[% loo.frameworkcode %][% loop.count %]">Export to CSV spreadsheet</label><input type="radio" name="type_export_[% loo.frameworkcode %]" value="csv" id="csv_type_export_[% loo.frameworkcode %][% loop.count %]" checked="checked" /></li>
-                            <li><label for="xml_type_export_[% loo.frameworkcode %][% loop.count %]">Export to Excel as XML format, compatible with OpenOffice/LibreOffice as well</label><input type="radio" name="type_export_[% loo.frameworkcode %]" value="excel" id="xml_type_export_[% loo.frameworkcode %][% loop.count %]" /></li>
-                            <li><label for="ods_type_export_[% loo.frameworkcode %][% loop.count %]">Export to OpenDocument spreadsheet format</label><input type="radio" name="type_export_[% loo.frameworkcode %]" value="ods" id="ods_type_export_[% loo.frameworkcode %][% loop.count %]" /></li>
-                            <li><label for="sql_type_export_[% loo.frameworkcode %][% loop.count %]">Export to SQL</label><input type="radio" name="type_export_[% loo.frameworkcode %]" value="sql" id="sql_type_export_[% loo.frameworkcode %][% loop.count %]" /></li>
-                        </ol>
-                        </fieldset>
-                        <fieldset class="action"><input type="submit" href="#" value="Export" title="Export to a spreadsheet" /> <a href="#" class="cancel import_export_close">Cancel</a> </fieldset>
+
+                <!-- Button to trigger modal -->
+                <a href="#" data-toggle="modal" data-target="#exportModal_[% loo.frameworkcode %][% loop.count %]">Export</a>
+                <!-- Modal -->
+                <div class="modal hide" id="exportModal_[% loo.frameworkcode %][% loop.count %]" tabindex="-1" role="dialog" aria-labelledby="exportLabelexportModal_[% loo.frameworkcode %][% loop.count %]" aria-hidden="true">
+                    <div class="modal-header">
+                        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">?</button>
+                        <h3 id="exportLabelexportModal_[% loo.frameworkcode %][% loop.count %]">Export [% loo.frameworktext %] framework</h3>
+                    </div>
+                    <form action="import_export_framework.pl" name="form_[% loo.frameworkcode %]" method="get" target="_blank"  class="form_export">
+                        <div class="modal-body">
+                            <fieldset>
+                                <input type="hidden" name="frameworkcode" value="[% loo.frameworkcode %]" />
+                                <p><label for="csv_type_export_[% loo.frameworkcode %][% loop.count %]"><input type="radio" name="type_export_[% loo.frameworkcode %]" value="csv" id="csv_type_export_[% loo.frameworkcode %][% loop.count %]" checked="checked" /> Export to CSV spreadsheet</label></p>
+                                <p><label for="xml_type_export_[% loo.frameworkcode %][% loop.count %]"><input type="radio" name="type_export_[% loo.frameworkcode %]" value="excel" id="xml_type_export_[% loo.frameworkcode %][% loop.count %]" /> Export to Excel with XML format, compatible with OpenOffice/LibreOffice as well</label></p>
+                                <p><label for="ods_type_export_[% loo.frameworkcode %][% loop.count %]"><input type="radio" name="type_export_[% loo.frameworkcode %]" value="ods" id="ods_type_export_[% loo.frameworkcode %][% loop.count %]" /> Export to OpenDocument spreadsheet format</label></p>
+                                <p><label for="sql_type_export_[% loo.frameworkcode %][% loop.count %]"><input type="radio" name="type_export_[% loo.frameworkcode %]" value="sql" id="sql_type_export_[% loo.frameworkcode %][% loop.count %]" /> Export to SQL</label></p>
+
+                            </fieldset>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="submit" class="btn">Export</button>
+                            <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Cancel</button>
+                        </div>
                     </form>
                 </div>
-                </div>
             </td>
-            <td><div class="import_export"><a class="import_export_fw" href="#" title="Import [% loo.frameworkcode %] framework structure (fields and subfields) from a spreadsheet file (.csv, .xml, .ods) or SQL file">Import</a>
-            <div class="import_export_options">
-                <form action="/cgi-bin/koha/admin/import_export_framework.pl" name="form_i_[% loo.frameworkcode %]" id="form_i_[% loo.frameworkcode %]" method="post" enctype="multipart/form-data" class="form_import">
-                    <fieldset class="rows">
-                    <legend>Import [% frameworkcode %] framework structure (fields and subfields) from a spreadsheet file (.csv, .xml, .ods) or SQL file</legend>
-                    <input type="hidden" name="frameworkcode" value="[% loo.frameworkcode %]" />
-                    <input type="hidden" name="action" value="import" />
-                    <ol>
-                        <li><label for="file_import_[% loo.frameworkcode %]">Upload file:</label><input type="file" name="file_import_[% loo.frameworkcode %]" id="file_import_[% loo.frameworkcode %]" class="input_import" value="" autocomplete="off" /></li>
-                    </ol>
-                    </fieldset>
-                    <fieldset class="action"><input type="submit" value="Import" /><div id="importing_[% loo.frameworkcode %]" style="display:none" class="importing"><img src="[% interface %]/[% theme %]/img/loading-small.gif" /><span class="importing_msg"></span></div> <a href="#" class="cancel import_export_close">Cancel</a> </fieldset>
-                </form>
-            </div>
-            </div>
+            <td>
+
+                <!-- Button to trigger modal -->
+                <a href="#" data-toggle="modal" data-target="#importModal_[% loo.frameworkcode %][% loop.count %]">Import</a>
+                <!-- Modal -->
+                <div class="modal hide" id="importModal_[% loo.frameworkcode %][% loop.count %]" tabindex="-1" role="dialog" aria-labelledby="importLabelexportModal_[% loo.frameworkcode %][% loop.count %]" aria-hidden="true">
+                    <div class="modal-header">
+                        <button type="button" class="closebtn" data-dismiss="modal" aria-hidden="true">?</button>
+                        <h3 id="importLabelexportModal_[% loo.frameworkcode %][% loop.count %]">Import [% loo.frameworkcode %] framework structure (fields and subfields) from a spreadsheet file (.csv, .xml, .ods) or SQL file</h3>
+                    </div>
+                    <form action="/cgi-bin/koha/admin/import_export_framework.pl" name="form_i_[% loo.frameworkcode %]" id="form_i_[% loo.frameworkcode %]" method="post" enctype="multipart/form-data" class="form_import">
+                        <div class="modal-body">
+                                <input type="hidden" name="frameworkcode" value="[% loo.frameworkcode %]" />
+                                <input type="hidden" name="action" value="import" />
+                                <p><label for="file_import_[% loo.frameworkcode %]">Upload file:</label> <input type="file" name="file_import_[% loo.frameworkcode %]" id="file_import_[% loo.frameworkcode %]" class="input_import" /></p>
+                                <div id="importing_[% loo.frameworkcode %]" style="display:none" class="importing"><img src="[% interface %]/[% theme %]/img/loading-small.gif" alt="" /><span class="importing_msg"></span></div>
+                        </div>
+                        <div class="modal-footer">
+                            <button type="submit" class="btn">Import</button>
+                            <button class="btn btn-link" data-dismiss="modal" aria-hidden="true">Close</button>
+                        </div>
+                    </form>
+                </div>
         </td>
         </tr>
     [% END %]
-- 
1.7.9.5

From tomascohen at gmail.com  Thu Aug 15 00:30:46 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Wed, 14 Aug 2013 19:30:46 -0300
Subject: [Koha-patches] [PATCH 1/2] Bug 10733: Memcached on package installs
Message-ID: <1376519447-20446-1-git-send-email-tomascohen@gmail.com>

This patch makes the koha-create script adjust the koha-conf.xml file
with the proper string substitutions to enable the use of memcached
for the created Koha instance.

It adds three option switches that control this:

 --use-memcached (defaults to "no")
 --memcached-servers "host1:port1,..." (defaults to 127.0.0.1:11211)
 --memcached-namespace "desired_namespace" (defaults to koha_${instance})

Note: the docs discourage setting user's own namespace.

Using memcached is off as the default. The relevant configuration variables will remain empty
if the user doesn't pass --use-memcached to the command. It matches the current behaviour.

To test:
- Apply the patch
- Build your own packages and install them on a test server
a) Create a new instance without using the new switches like:
 $ koha-create --create-db memctest
 - Check that /etc/koha/sites/memctest/koha-conf.xml contains:
   * Empty <memcached_servers> tag.
   * Empty <memcached_namespace> tag.
b) Play with the possible combination of option switches
(Note that the code defaults to empty and will remain like that if --use-memcached is not
used, so less tests...)
 $ koha-create --create-db --use-memcached memctest
 $ koha-create --create-db --use-memcached --memcached-servers "anything:xxx" memctest
 $ koha-create --create-db --use-memcached --memcached-servers "anything:xxx" --memcached-namespace "something" memctest
 $ koha-create --create-db --use-memcached --memcached-namespace "something" memctest
 - Check the koha-conf.xml file reflects the chosen options.
c) Run
 $ koha-create --help
 - It should advertise this addition accordingly.
d) Run
 $ man koha-create
 - Man page for koha-create should provide good information on the new switches behaviour

Enjoy
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 debian/docs/koha-create.xml            | 24 ++++++++++++++++++
 debian/scripts/koha-create             | 45 ++++++++++++++++++++++++++++++++--
 debian/templates/koha-conf-site.xml.in |  4 +--
 3 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/debian/docs/koha-create.xml b/debian/docs/koha-create.xml
index 31c168a..0781fd3 100644
--- a/debian/docs/koha-create.xml
+++ b/debian/docs/koha-create.xml
@@ -29,6 +29,9 @@
       <arg><option>--zebralang</option> en|es|fr|nb|ru|uk</arg>
       <arg><option>--auth-idx</option> dom|grs1</arg>
       <arg><option>--biblio-idx</option> dom|grs1</arg>
+      <arg><option>--use-memcached</option></arg>
+      <arg><option>--memcached-servers</option> server:port</arg>
+      <arg><option>--memcached-namespace</option> koha_namespace</arg>
       <arg><option>--defaultsql</option> /path/to/some.sql</arg>
       <arg><option>--configfile</option> /path/to/config</arg>
       <arg><option>--passwdfile</option> /path/to/passwd</arg>
@@ -125,6 +128,27 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term><option>--use-memcached</option></term>
+      <listitem>
+        <para>Make the Koha instance use memcached. <option>Disabled by default</option>.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><option>--memcached-servers</option></term>
+      <listitem>
+        <para>Specify a comma-separated list of host:port memcached servers for using with the created Koha instance. Defaults to <option>127.0.0.1:11211</option>, the needed configuration for a locally installed memcached server.</para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><option>--memcached-namespace</option></term>
+      <listitem>
+        <para>Specifiy a memcached <option>namespace</option> for the created Koha instance. You usually leave this option alone to avoid namespace collisions. It defaults to <option>koha_instance</option>.</para>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
   </refsect1>
 
diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index e8b2578..bcfadc9 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -61,6 +61,8 @@ generate_config_file() {
         -e "s/__UNIXUSER__/$username/g" \
         -e "s/__UNIXGROUP__/$username/g" \
         -e "s/__PLUGINS_DIR__/\/var\/lib\/koha\/$name\/plugins/g" \
+        -e "s/__MEMCACHED_NAMESPACE__/$MEMCACHED_NAMESPACE/g" \
+        -e "s/__MEMCACHED_SERVERS__/$MEMCACHED_SERVERS/g" \
         "/etc/koha/$1" > "$2"
 
 }
@@ -154,6 +156,26 @@ EOF`
     esac
 }
 
+
+set_memcached()
+{
+    local instance="$1"
+
+    if [ "$CLO_MEMCACHED_SERVERS" != "" ]; then
+        MEMCACHED_SERVERS=$CLO_MEMCACHED_SERVERS
+    else
+        MEMCACHED_SERVERS=$DEFAULT_MEMCACHED_SERVERS
+    fi
+
+    if [ "$CLO_MEMCACHED_NAMESPACE" != "" ]; then
+        MEMCACHED_NAMESPACE=$CLO_MEMCACHED_NAMESPACE
+    else
+        # default
+        MEMCACHED_NAMESPACE="koha_$instance"
+    fi
+
+}
+
 # Set defaults and read config file, if it exists.
 DOMAIN=""
 OPACPORT="80"
@@ -167,6 +189,10 @@ ZEBRA_MARC_FORMAT="marc21"
 ZEBRA_LANGUAGE="en"
 ADMINUSER="1"
 PASSWDFILE="/etc/koha/passwd"
+USE_MEMCACHED="no"
+MEMCACHED_SERVERS=""
+MEMCACHED_NAMESPACE=""
+DEFAULT_MEMCACHED_SERVERS="127.0.0.1:11211"
 
 # Indexing mode variables (default is DOM)
 BIBLIOS_INDEXING_MODE="dom"
@@ -184,7 +210,7 @@ fi
 
 [ $# -ge 2 ] && [ $# -le 16 ] || die $usage
 
-TEMP=`getopt -o crpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,marcflavor:,auth-idx:,biblio-idx:,zebralang:,defaultsql:,configfile:,passwdfile:,database:,adminuser: \
+TEMP=`getopt -o crpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,use-memcached,marcflavor:,auth-idx:,biblio-idx:,zebralang:,defaultsql:,configfile:,passwdfile:,database:,adminuser:,memcached-servers:,memcached-namespace:, \
      -n "$0" -- "$@"`
 
 # Note the quotes around `$TEMP': they are essential!
@@ -197,6 +223,8 @@ CLO_DEFAULTSQL=""
 CLO_ADMINUSER=""
 CLO_BIBLIOS_INDEXING_MODE=""
 CLO_AUTHORITIES_INDEXING_MODE=""
+CLO_MEMCACHED_SERVERS=""
+CLO_MEMCACHED_NAMESPACE=""
 
 
 while true ; do
@@ -204,7 +232,16 @@ while true ; do
 		-c|--create-db) op=create ; shift ;;
 		-r|--request-db) op=request ; shift ;;
 		-p|--populate-db) op=populate ; shift ;;
-        -u|--use-db) op=use ; shift ;;
+            -u|--use-db) op=use ; shift ;;
+            --use-memcached)
+                USE_MEMCACHED="yes"
+                shift ;;
+            --memcached-servers)
+                CLO_MEMCACHED_SERVERS="$2"
+                shift 2 ;;
+            --memcached-namespace)
+                CLO_MEMCACHED_NAMESPACE="$2"
+                shift 2;;
 		-m|--marcflavor) CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
 		-l|--zebralang) CLO_ZEBRA_LANGUAGE="$2" ; shift 2 ;;
 		--auth-idx) CLO_AUTHORITIES_INDEXING_MODE="$2" ; shift 2 ;;
@@ -267,6 +304,10 @@ set_authorities_indexing_mode $AUTHORITIES_INDEXING_MODE $ZEBRA_MARC_FORMAT
 
 name="$1"
 
+if [ "$USE_MEMCACHED" = "yes" ]; then
+    set_memcached $name
+fi
+
 opacdomain="$OPACPREFIX$name$OPACSUFFIX$DOMAIN"
 intradomain="$INTRAPREFIX$name$INTRASUFFIX$DOMAIN"
 
diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 71de9fb..9bf090b 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -276,8 +276,8 @@
  <!-- <pazpar2url>http://__PAZPAR2_HOST__:__PAZPAR2_PORT__/search.pz2</pazpar2url> -->
  <install_log>/usr/share/koha/misc/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_namespace></memcached_namespace>
+ <memcached_servers>__MEMCACHED_SERVERS__</memcached_servers>
+ <memcached_namespace>__MEMCACHED_NAMESPACE__</memcached_namespace>
  <zebra_bib_index_mode>__BIBLIOS_INDEXING_MODE__</zebra_bib_index_mode>
  <zebra_auth_index_mode>__AUTHORITIES_INDEXING_MODE__</zebra_auth_index_mode>
  <queryparser_config>/etc/koha/searchengine/queryparser.yaml</queryparser_config>
-- 
1.8.1.2


From tomascohen at gmail.com  Thu Aug 15 00:30:47 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Wed, 14 Aug 2013 19:30:47 -0300
Subject: [Koha-patches] [PATCH 2/2] Bug 10733: add 'memcached' as suggested
	dependency
In-Reply-To: <1376519447-20446-1-git-send-email-tomascohen@gmail.com>
References: <1376519447-20446-1-git-send-email-tomascohen@gmail.com>
Message-ID: <1376519447-20446-2-git-send-email-tomascohen@gmail.com>

Adds 'memcached' to the control.in file so the user is suggested by apt
to install it.

Sponsored-by: Universidad Nacional de Cordoba
---
 debian/control.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/control.in b/debian/control.in
index e2b8882..c3d463f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -32,7 +32,8 @@ Depends: ${misc:Depends}, ${koha:Depends},
  unzip,
  xmlstarlet,
  yaz
-Suggests: mysql-server
+Suggests: mysql-server,
+ memcached
 Homepage: http://koha-community.org/
 Description: integrated (physical) library management system
  Koha is an Integrated Library Managment system for real-world libraries
-- 
1.8.1.2


From tomascohen at gmail.com  Thu Aug 15 15:24:27 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Thu, 15 Aug 2013 10:24:27 -0300
Subject: [Koha-patches] [PATCH] Bug 10733: Follow-up - use koha-sites.conf
Message-ID: <1376573067-6383-1-git-send-email-tomascohen@gmail.com>

In order to respect the current schema, where configuration values are pondered
like this:

hardcoded < koha-sites.conf < koha-create option switches

I changed the patch a bit. I even changed MEMCACHED_NAMESPACE for MEMCACHED_PREFIX
that seems to fit better in the current schema.

Any feedback is welcome.
Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 debian/docs/koha-create.xml | 28 +++++++++++++++++++++++++---
 debian/scripts/koha-create  | 32 ++++++++++++++++++++++----------
 2 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/debian/docs/koha-create.xml b/debian/docs/koha-create.xml
index 0781fd3..61cf588 100644
--- a/debian/docs/koha-create.xml
+++ b/debian/docs/koha-create.xml
@@ -31,7 +31,7 @@
       <arg><option>--biblio-idx</option> dom|grs1</arg>
       <arg><option>--use-memcached</option></arg>
       <arg><option>--memcached-servers</option> server:port</arg>
-      <arg><option>--memcached-namespace</option> koha_namespace</arg>
+      <arg><option>--memcached-prefix</option> namespace_prefix</arg>
       <arg><option>--defaultsql</option> /path/to/some.sql</arg>
       <arg><option>--configfile</option> /path/to/config</arg>
       <arg><option>--passwdfile</option> /path/to/passwd</arg>
@@ -143,9 +143,9 @@
     </varlistentry>
 
     <varlistentry>
-      <term><option>--memcached-namespace</option></term>
+      <term><option>--memcached-prefix</option></term>
       <listitem>
-        <para>Specifiy a memcached <option>namespace</option> for the created Koha instance. You usually leave this option alone to avoid namespace collisions. It defaults to <option>koha_instance</option>.</para>
+        <para>Specifiy a <option>namespace prefix</option> for memcached. You usually leave this option alone to avoid namespace collisions. It defaults to <option>koha_</option>.</para>
       </listitem>
     </varlistentry>
 
@@ -219,6 +219,28 @@
       </varlistentry>
 
       <varlistentry>
+        <term><option>USE_MEMCACHED</option></term>
+        <listitem>
+          <para>Valid values are <option>yes</option> and <option>no</option>. If not present koha-create will default to <option>no</option>. Also, this will be overriden by the <option>--use-memcached</option> switch.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>MEMCACHED_SERVERS</option></term>
+        <listitem>
+          <para>A comma-separated list of valid memcached servers. Usually in the form of <option>host:port</option>. If not present koha-create will default to <option>127.0.0.1:11211</option>. Also, this will be overriden by the arguments of the <option>--memcached-servers</option> switch.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>MEMCACHED_PREFIX</option></term>
+        <listitem>
+          <para>A prefix for all new Koha instances to use in memcached. If not present koha-create will default to <option>koha_</option>. Also, this will be overriden by the arguments of the <option>--memcached-prefix</option> switch.</para>
+        </listitem>
+      </varlistentry>
+
+
+      <varlistentry>
         <term><option>ZEBRA_MARC_FORMAT</option></term>
         <listitem>
           <para>Specifies format of MARC records to be indexed by Zebra.  Possible values are 'marc21', 'normarc' and 'unimarc'.</para>
diff --git a/debian/scripts/koha-create b/debian/scripts/koha-create
index bcfadc9..d655ca2 100755
--- a/debian/scripts/koha-create
+++ b/debian/scripts/koha-create
@@ -23,6 +23,8 @@ usage="Usage: $0 [--create-db|--request-db|--populate-db|--use-db] \
     [--marcflavor marc21|normarc|unimarc] \
     [--zebralang en|es|fr|nb|ru|uk] \
     [--auth-idx dom|grs1] [--biblio-idx dom|grs1] \
+    [--use-memcached] \
+    [--memcached-servers server:port] [--memcached-prefix prefix] \
     [--defaultsql /path/to/some.sql] \
     [--configfile /path/to/config] [--passwdfile /path/to/passwd] \
     [--database database] [--adminuser n] instancename"
@@ -164,14 +166,20 @@ set_memcached()
     if [ "$CLO_MEMCACHED_SERVERS" != "" ]; then
         MEMCACHED_SERVERS=$CLO_MEMCACHED_SERVERS
     else
-        MEMCACHED_SERVERS=$DEFAULT_MEMCACHED_SERVERS
+        if [ "$MEMCACHED_SERVERS" = "" ]; then
+            MEMCACHED_SERVERS=$DEFAULT_MEMCACHED_SERVERS
+        # else: was set by the koha-sites.conf file
+        fi
     fi
 
-    if [ "$CLO_MEMCACHED_NAMESPACE" != "" ]; then
-        MEMCACHED_NAMESPACE=$CLO_MEMCACHED_NAMESPACE
+    if [ "$CLO_MEMCACHED_PREFIX" != "" ]; then
+        MEMCACHED_NAMESPACE="$CLO_MEMCACHED_PREFIX"_"$instance"
     else
-        # default
-        MEMCACHED_NAMESPACE="koha_$instance"
+        if [ "$MEMCACHED_PREFIX" != "" ]; then 
+            MEMCACHED_NAMESPACE="$MEMCACHED_PREFIX"_"$instance"
+        else
+            MEMCACHED_NAMESPACE="$DEFAULT_MEMCACHED_PREFIX"_"$instance"
+        fi
     fi
 
 }
@@ -189,10 +197,14 @@ ZEBRA_MARC_FORMAT="marc21"
 ZEBRA_LANGUAGE="en"
 ADMINUSER="1"
 PASSWDFILE="/etc/koha/passwd"
+
+# memcached variables
 USE_MEMCACHED="no"
 MEMCACHED_SERVERS=""
-MEMCACHED_NAMESPACE=""
+MEMCACHED_PREFIX=""
+# hardcoded memcached defaults
 DEFAULT_MEMCACHED_SERVERS="127.0.0.1:11211"
+DEFAULT_MEMCACHED_PREFIX="koha_"
 
 # Indexing mode variables (default is DOM)
 BIBLIOS_INDEXING_MODE="dom"
@@ -210,7 +222,7 @@ fi
 
 [ $# -ge 2 ] && [ $# -le 16 ] || die $usage
 
-TEMP=`getopt -o crpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,use-memcached,marcflavor:,auth-idx:,biblio-idx:,zebralang:,defaultsql:,configfile:,passwdfile:,database:,adminuser:,memcached-servers:,memcached-namespace:, \
+TEMP=`getopt -o crpm:l:d:f:b:a: -l create-db,request-db,populate-db,use-db,use-memcached,marcflavor:,auth-idx:,biblio-idx:,zebralang:,defaultsql:,configfile:,passwdfile:,database:,adminuser:,memcached-servers:,memcached-prefix:, \
      -n "$0" -- "$@"`
 
 # Note the quotes around `$TEMP': they are essential!
@@ -224,7 +236,7 @@ CLO_ADMINUSER=""
 CLO_BIBLIOS_INDEXING_MODE=""
 CLO_AUTHORITIES_INDEXING_MODE=""
 CLO_MEMCACHED_SERVERS=""
-CLO_MEMCACHED_NAMESPACE=""
+CLO_MEMCACHED_PREFIX=""
 
 
 while true ; do
@@ -239,8 +251,8 @@ while true ; do
             --memcached-servers)
                 CLO_MEMCACHED_SERVERS="$2"
                 shift 2 ;;
-            --memcached-namespace)
-                CLO_MEMCACHED_NAMESPACE="$2"
+            --memcached-prefix)
+                CLO_MEMCACHED_PREFIX="$2"
                 shift 2;;
 		-m|--marcflavor) CLO_ZEBRA_MARC_FORMAT="$2" ; shift 2 ;;
 		-l|--zebralang) CLO_ZEBRA_LANGUAGE="$2" ; shift 2 ;;
-- 
1.8.1.2


From oleonard at myacpl.org  Thu Aug 15 16:19:44 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 15 Aug 2013 10:19:44 -0400
Subject: [Koha-patches] [PATCH] Bug 10661 - Mandatory item fields should be
	formatted the same on all forms
Message-ID: <1376576384-10261-1-git-send-email-oleonard@myacpl.org>

Mandatory item fields are not indicated the same way in all places. This
patch corrects two places where required fields were shown in bold
rather than using the standard "required" class: When adding an order
from a staged file and when adding an item for a new issue of a serial.

Unrelated changes: Added $KohaDates formatting of date and time and
corrected capitalization on a heading on the add order from staged file
page.

It would be nice to be able to use the same method for displaying the
item form as we use on neworderentry.tt -- pulling in the form from a
separate include. However that system is designed for handling multiple
items and would need to be adapted for these cases.

To test, you must have a staged file from which to add an order. Open an
existing basket or create a new one and choose to add an order "From a
staged file." Choose a staged file from which to order. The item entry
form under the "Import all" heading should show required fields in red.

To test in serials: Begin the process for receiving an item from an
existing subscription. On the serials-edit page, find the "Click to add
item" links and click to open the item edit forms. There should be one
under the numbered issue and the supplemental issue forms. In both cases
the item edit screen should show the mandatory item fields in red.
---
 .../prog/en/modules/acqui/addorderiso2709.tt       |   11 +++++++----
 .../prog/en/modules/serials/serials-edit.tt        |   14 ++++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 3223dc2..78107d9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -52,7 +52,7 @@
            <div class="yui-b">
              [% IF ( batch_details ) %]
                   <h1>Add orders from [% comments %]
-                    ([% file_name %] staged on [% upload_timestamp %])
+                    ([% file_name %] staged on [% upload_timestamp | $KohaDates with_hours => 1 %])
                   </h1>
                <div>
                    <form action="[% scriptname %]" method="post" name="import_biblios">
@@ -123,7 +123,7 @@
            </div>
         [% IF ( import_batch_id ) %]
             <div class="yui-b">
-            <h2>Import All</h2>
+            <h2>Import all</h2>
             <p>Import all the lines in the basket with the following parameters:</p>
             <form action="/cgi-bin/koha/acqui/addorderiso2709.pl" method="post" id="Aform">
                     <input type="hidden" name="op" value="import_records"/>
@@ -148,8 +148,11 @@
                     <div id="itemblock">
                         <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li style="[% iteminformatio.hidden %];">
                             <div class="subfield_line" id="subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
-
-                                <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label>
+                                [% IF (iteminformatio.mandatory) %]
+                                    <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label>
+                                [% ELSE %]
+                                    <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label>
+                                [% END %]
                                 [% iteminformatio.marc_value %]
                                 <input type="hidden" name="itemid" value="1" />
                                 <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" />
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
index 8f9ea5f..ecae99d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt
@@ -236,8 +236,11 @@ $(document).ready(function() {
         <div id="item[% item.serialid %][% item.countitems %]" class="items">
         <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li>
                <div class="subfield_line" style="[% iteminformatio.hidden %]" id="subfield[% item.serialid %][% item.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
-                              
-                <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label>
+                [% IF (iteminformatio.mandatory) %]
+                    <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label>
+                [% ELSE %]
+                    <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label>
+                [% END %]
                 [% iteminformatio.marc_value %]
                 <input type="hidden" name="itemid" value="[% item.itemid %]" />
                 <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" />
@@ -344,8 +347,11 @@ $(document).ready(function() {
         <div id="item[% newserialloo.serialid %][% newserialloo.countitems %]" class="items">
         <ol>[% FOREACH iteminformatio IN newserialloo.iteminformation %]<li>
                <div class="subfield_line" style="[% iteminformatio.hidden %]" id="subfield[% newserialloo.serialid %][% newserialloo.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
-   
-                <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label>
+                [% IF (iteminformatio.mandatory) %]
+                    <label class="required">[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label>
+                [% ELSE %]
+                    <label>[% iteminformatio.subfield %] - [% iteminformatio.marc_lib %]</label>
+                [% END %]
                 [% iteminformatio.marc_value %]
                 <input type="hidden" name="itemid" value="[% newserialloo.itemid %]" />
                 <input type="hidden" name="kohafield" value="[% iteminformatio.kohafield %]" />
-- 
1.7.9.5

From oleonard at myacpl.org  Thu Aug 15 18:29:51 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 15 Aug 2013 12:29:51 -0400
Subject: [Koha-patches] [PATCH] Bug 10737 - Add "Add to basket" link on
	vendor search results page
Message-ID: <1376584192-11431-1-git-send-email-oleonard@myacpl.org>

This patch adds an "add to basket" link to the vendor search results
page for each open basket associated with each vendor. Clicking it
triggers a modal window with the "add to basket" choices for that vendor
and basket.

Other changes in this patch:

- "New basket" and "Receive shipment" buttons associated with each
  vendor search result have been converted to Bootstrap-styled buttons.
- Basket closed date has been moved into its own column so that the
  table can be sorted by that value.
- Table columns containing dates now use the "title-string" sort option,
  eliminating the need for a special date sorting algorithm.
- Converted some &'s to &amp;'s

To test, apply the patch and search for a vendor. For each vendor in
your search results baskets which are open should include an "add to
basket" link. Clicking it should open a modal dialog with the same "add
to basket" options offered on the basket page. The correct vendor ID and
basket number should be associated with each link.

The newly-styled "new basket" and "receive shipment" buttons should work
correctly. Table sorting should work correctly, including the new
"closed" column.
---
 .../prog/en/modules/acqui/booksellers.tt           |   65 +++++++++++++++-----
 1 file changed, 49 insertions(+), 16 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index 525ea66..a6e0591 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -14,17 +14,17 @@
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function() {
-    [% IF (dateformat == 'metric') %]
-        dt_add_type_uk_date();
-    [% END %]
     $("table.baskets").dataTable($.extend(true, {}, dataTablesDefaults, {
         'sDom': 't',
         'bPaginate': false,
         'bFilter': false,
         'bInfo': false,
         "aaSorting": [[ 1, "asc" ]],
+        "aoColumns": [
+            null,null,null,null,null,null,{ "sType": "title-string" },{ "sType": "title-string" },null,null
+        ],
         'aoColumnDefs': [
-            { 'aTargets': [-1], 'bSortable': false }
+            { 'aTargets': [-1,-2], 'bSortable': false }
         ]
     }));
     $("#supplierlist").change(function() {
@@ -63,9 +63,9 @@ $(document).ready(function() {
         </p>
     [% END %]
     [% IF ( allbaskets ) %]
-        <p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&booksellerid=[% booksellerid %]">Show active baskets only</a></p>
+        <p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&amp;booksellerid=[% booksellerid %]">Show active baskets only</a></p>
     [% ELSE %]
-        <p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&booksellerid=[% booksellerid %]&allbaskets=1">Show all baskets</a></p>
+        <p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&amp;booksellerid=[% booksellerid %]&amp;allbaskets=1">Show all baskets</a></p>
     [% END %]
     <div id="acqui_order_supplierlist">
         [% FOREACH supplier IN loop_suppliers %]
@@ -80,12 +80,12 @@ $(document).ready(function() {
                 <span class="action">
                     [% IF ( CAN_user_acquisition_order_manage ) %]
                         [% IF ( supplier.active ) %]
-                            <input type="button" value="New basket" onclick="window.location.href='/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&amp;op=add_form'" />
+                            <a class="btn btn-small" href="/cgi-bin/koha/acqui/basketheader.pl?booksellerid=[% supplier.booksellerid %]&amp;op=add_form"><i class="icon-plus"></i> New basket</a>
                         [% ELSE %]
                             (inactive)
                         [% END %]
                     [% END %]
-                    <input type="button" value="Receive shipment" onclick="window.location.href='/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid %]'" />
+                    <a class="btn btn-small" href="/cgi-bin/koha/acqui/parcels.pl?booksellerid=[% supplier.booksellerid %]"><i class="icon-inbox"></i> Receive shipment</a>
                 </span>
                 <div class="baskets">
                     [% IF ( supplier.loop_basket.size ) %]
@@ -99,6 +99,8 @@ $(document).ready(function() {
                                     <th>Items expected</th>
                                     <th>Created by</th>
                                     <th>Date</th>
+                                    <th>Closed</th>
+                                    <th>&nbsp;</th>
                                     <th>&nbsp;</th>
                                 </tr>
                             </thead>
@@ -118,23 +120,54 @@ $(document).ready(function() {
                                             [% basket.authorisedby_firstname %]
                                             [% basket.authorisedby_surname %]
                                         </td>
-                                        <td>[% basket.creationdate | $KohaDates %]</td>
+                                        <td><span title="[% basket.creationdate %]">[% basket.creationdate | $KohaDates %]</span></td>
                                         <td>
                                             [% IF ( basket.closedate ) %]
-                                                closed on [% basket.closedate | $KohaDates %]
-                                                <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">View</a>
+                                                <span title="[% basket.closedate %]">[% basket.closedate | $KohaDates %]</span>
                                             [% ELSE %]
-                                                [% IF ( basket.active ) %]
-                                                    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">Modify</a>
-                                                [% ELSE %]
-                                                    <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">View</a>
-                                                [% END %]
+                                                <span title="9999-99-99"></span>
+                                            [% END %]
+                                        </td>
+                                        <td>
+                                            <a href="/cgi-bin/koha/acqui/basket.pl?basketno=[% basket.basketno %]">View</a>
+                                        </td>
+                                        <td>
+                                            [% UNLESS ( basket.closedate ) %]
+                                                <a id="addtoBasketLabel[% basket.basketno %]" href="#addtoBasket[% basket.basketno %]" role="button" data-toggle="modal">Add to basket</a>
+                                                <!-- Modal -->
+                                                <div id="addtoBasket[% basket.basketno %]" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="addtoBasketLabel[% basket.basketno %]" aria-hidden="true">
+                                                    <div class="modal-body">
+                                                        <fieldset>
+                                                            <legend>Add order to [% supplier.name %] basket [% basket.basketname %]</legend>
+                                                              <ul>
+                                                                <li>
+                                                                  <label for="q[% basket.basketno %]">From an existing record: </label>
+                                                                  <form method="post" action="/cgi-bin/koha/acqui/neworderbiblio.pl">
+                                                                    <input type="hidden" value="[% supplier.booksellerid %]" name="booksellerid">
+                                                                    <input type="hidden" value="[% basket.basketno %]" name="basketno">
+                                                                    <input type="text" name="q" size="25" id="q[% basket.basketno %]">
+                                                                    <input type="submit" value="Search" class="submit">
+                                                                  </form>
+                                                                </li>
+                                                                <li><a href="/cgi-bin/koha/acqui/newordersuggestion.pl?booksellerid=[% supplier.booksellerid %]&amp;basketno=[% basket.basketno %]">From a suggestion</a></li>
+                                                                <li><a href="/cgi-bin/koha/acqui/newordersubscription.pl?booksellerid=[% supplier.booksellerid %]&amp;basketno=[% basket.basketno %]">From a subscription</a></li>
+                                                                <li><a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% supplier.booksellerid %]&amp;basketno=[% basket.basketno %]">From a new (empty) record</a></li>
+                                                                <li><a href="/cgi-bin/koha/acqui/z3950_search.pl?booksellerid=[% supplier.booksellerid %]&amp;basketno=[% basket.basketno %]">From an external source</a></li>
+                                                                <li><a href="/cgi-bin/koha/acqui/addorderiso2709.pl?booksellerid=[% supplier.booksellerid %]&amp;basketno=[% basket.basketno %]"> From a staged file</a></li>
+                                                              </ul>
+                                                        </fieldset>
+                                                    </div>
+                                                    <div class="modal-footer">
+                                                        <a href="#" class="cancel" data-dismiss="modal" aria-hidden="true">Cancel</a>
+                                                    </div>
+                                                </div>
                                             [% END %]
                                         </td>
                                     </tr>
                                 [% END %][%# FOREACH basket IN supplier.loop_basket %]
                             </tbody>
                         </table>
+
                     [% ELSE %]
                         <p>No pending baskets</p>
                     [% END %][%# IF ( supplier.loop_basket.size ) %]
-- 
1.7.9.5

From oleonard at myacpl.org  Thu Aug 15 21:13:05 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Thu, 15 Aug 2013 15:13:05 -0400
Subject: [Koha-patches] [PATCH] Bug 10347 - Deactivate "Add item" button
	when "Add multiple copies" was activated
Message-ID: <1376593985-12526-1-git-send-email-oleonard@myacpl.org>

When the "Add multiple items" button is pressed the other submit buttons
should be hidden in order to eliminate confusion about which button
submits the form at that stage in the process.

This patch alters the form so that clicking the "add multiple" button
hides the other two buttons and displays form for submitting the number
of copies to add.

This patch also makes changes to accompanying text in order to make
things (hopefully) clearer. The button text has been changed (again, see
Bug 10346) to "Add multiple copies of this item."

The triggered form is now labelled "Number of additional copies of this
item to add" in an attempt to convey the fact that the number entered
will be added to the one item represented by the item form above. i.e.
if you enter "3" as the number of additional copies, you will end up
with 4.

Explanatory text has been added "The barcode you enter will be
incremented for each additional item," because that seemed non-obvious
about the process.

Unrelated change: a section of obsolete JavaScript has been removed.

To test, go to the add/edit items page for a new or existing record.
Test adding a single item, adding & duplicating, and adding multiple.
The add multiple form should be shown upon clicking 'add multiple,' and
hidden when 'cancel' is clicked.
---
 .../prog/en/modules/cataloguing/additem.tt         |   52 +++++++++++---------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
index 8cc064b..148d920 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
@@ -30,23 +30,24 @@ $(document).ready(function(){
 			$(this).append("<span class=\"linktools\"><a href=\"/cgi-bin/koha/cataloguing/additem.pl?op=edititem&frameworkcode=[% frameworkcode %]&biblionumber=[% biblionumber %]&itemnumber="+num_rowid+"#edititem\">Edit Item</a> <a href=\"/cgi-bin/koha/cataloguing/additem.pl?op=delitem&frameworkcode=[% frameworkcode %]&biblionumber=[% biblionumber %]&itemnumber="+num_rowid+"\" onclick=\"confirm_deletion([% biblionumber %],"+num_rowid+"); return false;\">Delete Item</a></span>");
 		}
 		});
+    var multiCopyControl = $("#add_multiple_copies_span");
+    var addMultipleBlock = $("#addmultiple");
+    var addSingleBlock = $("#addsingle");
+    multiCopyControl.hide();
+    $("#add_multiple_copies").on("click",function(e){
+        e.preventDefault;
+        addMultipleBlock.toggle();
+        addSingleBlock.toggle();
+        multiCopyControl.toggle();
+    });
+    $("#cancel_add_multiple").on("click",function(e){
+        e.preventDefault();
+        addMultipleBlock.toggle();
+        addSingleBlock.toggle();
+        multiCopyControl.toggle();
+    });
 });
-function active(numlayer)
-{
-    for (i=10; i < 11 ; i++ ) {
-        ong = i+"XX";
-            link = "link"+i;
-        if (numlayer==i) {
-            document.getElementById(ong).style.visibility="visible";
-            document.getElementById(link).style.backgroundColor="#11AA11";
-            document.getElementById(link).style.backgroundImage="url([% themelang %]/images/background-mem.gif)";
-        } else {
-            document.getElementById(ong).style.visibility="hidden";
-            document.getElementById(link).style.backgroundColor="#FFFFFF";
-            document.getElementById(link).style.backgroundImage="";
-        }
-    }
-}
+
 function Check(f) {
     var total_errors = CheckMandatorySubfields(f);
     if (total_errors > 0) {
@@ -208,14 +209,19 @@ $(document).ready(function() {
 		when pressing the enter key, while in fact it is the first submit button that is validated, in our case the "add (single) item" button.
 		It is a bit tricky, but necessary in the sake of UI correctness.
     -->
-
-    <input type="submit" name="add_submit" value="Add item" onclick="return Check(this.form)" />
-    <input type="submit" name="add_duplicate_submit" value="Add &amp; duplicate" onclick="return Check(this.form)" />
-    <input type="submit" name="add_multiple_copies" value="Add multiple items" onclick="javascript:this.nextSibling.style.visibility='visible';document.f.number_of_copies.focus(); return false;" /><span id="add_multiple_copies_span" style="visibility:hidden">
-    <label for="number_of_copies">Number of items to add : </label>
-	<input type="text" id="number_of_copies" name="number_of_copies" value="" size="2" />
-	<input type="submit" id="add_multiple_copies_submit" name="add_multiple_copies_submit" value="Add" onclick="javascript:return Check(this.form) &amp;&amp; CheckMultipleAdd(this.form.number_of_copies.value);" />
+    <span id="addsingle">
+        <input type="submit" name="add_submit" value="Add item" onclick="return Check(this.form)" />
+        <input type="submit" name="add_duplicate_submit" value="Add &amp; duplicate" onclick="return Check(this.form)" />
+    </span>
+    <span id="addmultiple">
+        <input type="button" name="add_multiple_copies" id="add_multiple_copies" value="Add multiple copies of this item" />
     </span>
+    <fieldset id="add_multiple_copies_span">
+        <label for="number_of_copies">Number of additional copies of this item to add: </label>
+        <input type="text" id="number_of_copies" name="number_of_copies" value="" size="2" />
+        <input type="submit" id="add_multiple_copies_submit" name="add_multiple_copies_submit" value="Add" onclick="javascript:return Check(this.form) && CheckMultipleAdd(this.form.number_of_copies.value);" /> <a href="#" id="cancel_add_multiple" class="cancel">Cancel</a>
+        <div class="hint"><p>The barcode you enter will be incremented for each additional item.</p></div>
+    </fieldset>
 
     [% ELSE %]
     <input type="hidden" name="tag" value="[% itemtagfield %]" />
-- 
1.7.9.5

From nengard at bywatersolutions.com  Fri Aug 16 04:12:23 2013
From: nengard at bywatersolutions.com (Nicole C. Engard)
Date: Thu, 15 Aug 2013 22:12:23 -0400
Subject: [Koha-patches] [PATCH] Bug 10743: Add styles to 'my privacy' page
	in OPAC
Message-ID: <1376619143-9838-1-git-send-email-nengard@bywatersolutions.com>

This patch does a couple things.  Most importantly it adds
a new div around the privacy rules summary so that it can
be easily changed. It also moves the start of the form to
right above the form's select box so that it's not in the
new privacy rules div.

To test:

* Apply patch
* Enable the use of privacy via the sys prefs
* Log in to the OPAC
* Visit the 'my privacy' tab
* Make sure it looks okay
* Submit the form and make sure it works
* Repeat in the other theme
---
 .../opac-tmpl/prog/en/modules/opac-privacy.tt      |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
index 3bb988f..f854d32 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tt
@@ -20,13 +20,11 @@
     [% IF ( privacy_updated ) %]
         <div class="dialog message">Your privacy rules have been updated.</div>
     [% END %]
-
+	<div id="userprivacyrules" class="container">
     <h2>Privacy rule</h2>
     [% IF ( Ask_data ) %]
 		<p>We take great care in protecting your privacy. On this screen, you can define how long we keep your reading history.</p>
 		<p>Your options are: <p>
-		<form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-update-form">
-            <input type="hidden" name="op" value="update_privacy" />
             <ul id="opac-privacy-options-list">
                 <li class="privacy0">Forever: keep my reading history without limit. This is the option for users who want to keep track of what they are reading.</li>
                 <li class="privacy1">Default: keep my reading history according to local laws. This is the default option : the library will keep your reading history for the duration permitted by local laws.</li>
@@ -34,6 +32,9 @@
             </ul>
             <p id="note1">Please note that information on any book still checked-out must be kept by the library no matter which privacy option you choose.</p>
             <p id="note2">Please also note that the library staff can't update these values for you: it's your privacy!</p>
+    </div>
+    	<form action="/cgi-bin/koha/opac-privacy.pl" method="post" id="opac-privacy-update-form">
+            <input type="hidden" name="op" value="update_privacy" />
             <label for:"privacy">Please choose your privacy rule:</label>
             <select name="privacy">
                 [% IF ( privacy0 ) %]
-- 
1.7.2.3


From srdjan at catalyst.net.nz  Mon Aug 19 04:48:59 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon, 19 Aug 2013 14:48:59 +1200
Subject: [Koha-patches] [PATCH] Bug 10333: Labels/t_Batch.t needs to create
	its own data
Message-ID: <1376880539-23362-1-git-send-email-srdjan@catalyst.net.nz>

From: Jonathan Druart <jonathan.druart at biblibre.com>

prove t/db_dependent/Labels/t_Batch.t
db_dependent/Labels/t_Batch.t .. 1/33 # Testing Batch->new() method.
db_dependent/Labels/t_Batch.t .. ok
All tests successful.
Files=1, Tests=33,  1 wallclock secs ( 0.03 usr  0.00 sys +  0.34 cusr
0.00 csys =  0.37 CPU)
Result: PASS

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 t/db_dependent/Labels/t_Batch.t | 56 ++++++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 12 deletions(-)

diff --git a/t/db_dependent/Labels/t_Batch.t b/t/db_dependent/Labels/t_Batch.t
index b61f4de..c999602 100644
--- a/t/db_dependent/Labels/t_Batch.t
+++ b/t/db_dependent/Labels/t_Batch.t
@@ -1,9 +1,10 @@
 #!/usr/bin/perl
 #
 # Copyright 2007 Foundations Bible College.
+# Copyright 2013 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
@@ -17,17 +18,24 @@
 # 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 Modern::Perl;
 
-use Test::More tests => 23;
+use Test::More tests => 24;
 use C4::Context;
-use Data::Dumper;
+use MARC::Record;
+use MARC::Field;
+use C4::Biblio;
+use C4::Items;
 
 BEGIN {
     use_ok('C4::Labels::Batch');
 }
 
+# Start transaction
+my $dbh = C4::Context->dbh;
+$dbh->{AutoCommit} = 0;
+$dbh->{RaiseError} = 1;
+
 my $sth = C4::Context->dbh->prepare('SELECT branchcode FROM branches b LIMIT 0,1');
 $sth->execute();
 my $branch_code = $sth->fetchrow_hashref()->{'branchcode'};
@@ -59,12 +67,32 @@ foreach my $key (keys %{$expected_batch}) {
 }
 
 diag "Testing Batch->add_item() method.";
-my $sth1 = C4::Context->dbh->prepare('SELECT itemnumber FROM items LIMIT 0,10');
-$sth1->execute();
-while (my $row = $sth1->fetchrow_hashref()) {
-    diag sprintf('Database returned the following error: %s', $sth1->errstr) if $sth1->errstr;
-    ok($batch->add_item($row->{'itemnumber'}) eq 0 ) || diag "Batch->add_item() FAILED.";
-    $item_number = $row->{'itemnumber'};
+# Create the item
+my ( $f_holdingbranch, $sf_holdingbranch ) = GetMarcFromKohaField( 'items.holdingbranch' );
+my ( $f_homebranch, $sf_homebranch ) = GetMarcFromKohaField( 'items.homebranch' );
+is( $f_holdingbranch, $f_homebranch, "items information should be in the same field" );
+my $field = $f_holdingbranch;
+
+my $record = MARC::Record->new();
+$record->append_fields(
+    MARC::Field->new( $field, '', '', $sf_homebranch => 'CPL', $sf_holdingbranch => 'CPL' ),
+    MARC::Field->new( $field, '', '', $sf_homebranch => 'CPL', $sf_holdingbranch => 'CPL' ),
+    MARC::Field->new( $field, '', '', $sf_homebranch => 'CPL', $sf_holdingbranch => 'CPL' ),
+    MARC::Field->new( $field, '', '', $sf_homebranch => 'CPL', $sf_holdingbranch => 'CPL' ),
+    MARC::Field->new( $field, '', '', $sf_homebranch => 'CPL', $sf_holdingbranch => 'CPL' ),
+    MARC::Field->new( $field, '', '', $sf_homebranch => 'CPL', $sf_holdingbranch => 'CPL' ),
+    MARC::Field->new( $field, '', '', $sf_homebranch => 'CPL', $sf_holdingbranch => 'CPL' ),
+    MARC::Field->new( $field, '', '', $sf_homebranch => 'CPL', $sf_holdingbranch => 'CPL' ),
+    MARC::Field->new( $field, '', '', $sf_homebranch => 'CPL', $sf_holdingbranch => 'CPL' ),
+    MARC::Field->new( $field, '', '', $sf_homebranch => 'CPL', $sf_holdingbranch => 'CPL' ),
+);
+my ( $biblionumber, $biblioitemnumber ) = C4::Biblio::AddBiblio($record, '');
+my @iteminfo = C4::Items::AddItemBatchFromMarc( $record, $biblionumber, $biblioitemnumber, '' );
+
+my $itemnumbers = $iteminfo[0];
+
+for my $itemnumber ( @$itemnumbers ) {
+    ok($batch->add_item($itemnumber) eq 0 ) || diag "Batch->add_item() FAILED.";
 }
 
 diag "Testing Batch->retrieve() method.";
@@ -73,7 +101,9 @@ is_deeply($saved_batch, $batch) || diag "Retrieved batch object FAILED to verify
 
 diag "Testing Batch->remove_item() method.";
 
-ok($batch->remove_item($item_number) eq 0) || diag "Batch->remove_item() FAILED.";
+my $itemnumber = @$itemnumbers[0];
+ok($batch->remove_item($itemnumber) eq 0) || diag "Batch->remove_item() FAILED.";
+
 my $updated_batch = C4::Labels::Batch->retrieve(batch_id => $batch_id);
 is_deeply($updated_batch, $batch) || diag "Updated batch object FAILED to verify.";
 
@@ -81,3 +111,5 @@ diag "Testing Batch->delete() method.";
 
 my $del_results = $batch->delete();
 ok($del_results eq 0) || diag "Batch->delete() FAILED.";
+
+$dbh->rollback;
-- 
1.8.1.2

From oleonard at myacpl.org  Mon Aug 19 16:30:29 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 19 Aug 2013 10:30:29 -0400
Subject: [Koha-patches] [PATCH] Bug 3134 [Follow-up] Ability to select
	multiple reports to delete at once
Message-ID: <1376922629-4551-1-git-send-email-oleonard@myacpl.org>

This follow-up moves the checkboxes into a separate column from the
report ID in order to prevent visual inconsistencies.

To test, repeat the test plan from the original patch:

You must have two or more saved reports to delete. Deletion
should work properly when:

- Selecting one report for deletion by checking the box.
- Selecting more than one report for deletion by checking boxes.
- Clicking the old "Delete" link

Clicking the delete button should prompt you to confirm. Clicking cancel
should cancel.

Clicking the delete button when no boxes are checked should trigger an
alert asking you to select reports for deletion.
---
 .../en/modules/reports/guided_reports_start.tt     |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 9f35e08..60bbe28 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -72,7 +72,7 @@ $(document).ready(function(){
         'iDisplayLength': 20,
         'aaSorting': [[ 1, "asc" ]],
         'aoColumnDefs': [
-            { 'bSortable': false, 'bSearchable':false, 'aTargets': [-1, -2, -3, -4] },
+            { 'bSortable': false, 'bSearchable':false, 'aTargets': [0, -1, -2, -3, -4] },
             { 'bSearchable': false, 'aTargets': [3, 4] }
         ],
         'oLanguage': {
@@ -87,16 +87,16 @@ $(document).ready(function(){
                 $(this).remove();
             }
         });
-        rtable.fnFilter('', 3);
         rtable.fnFilter('', 4);
-        rtable.fnSetColumnVis(3, true);
+        rtable.fnFilter('', 5);
         rtable.fnSetColumnVis(4, true);
+        rtable.fnSetColumnVis(5, true);
 
         var g_id = $(ui.tab).attr('id')
         var g_name = $(ui.tab).text();
         if (g_id && g_id.length > 0) {
-            rtable.fnFilter('^' + g_name + '$', 3, true, true, true, false);
-            rtable.fnSetColumnVis(3, false);
+            rtable.fnFilter('^' + g_name + '$', 4, true, true, true, false);
+            rtable.fnSetColumnVis(4, false);
             for(var i in group_subgroups[g_id]) {
                 $("#subgroup_filter").append(
                     '<option value="' + group_subgroups[g_id][i][0] + '">'
@@ -287,6 +287,7 @@ canned reports and writing custom SQL reports.</p>
         <table id="table_reports">
             <thead>
                 <tr>
+                    <th>&nbsp;</th>
                     <th>ID</th>
                     <th>Report name</th>
                     <th>Type</th>
@@ -304,7 +305,8 @@ canned reports and writing custom SQL reports.</p>
             <tbody>
                 [% FOREACH savedreport IN savedreports %]
                     [% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
-                        <td><label>[% savedreport.id %] <input type="checkbox" name="ids" value="[% savedreport.id %]" /></label></td>
+                        <td><input type="checkbox" name="ids" value="[% savedreport.id %]" /></td>
+                        <td><label for="ids">[% savedreport.id %]</label></td>
                         <td>
                             [% IF ( savedreport.report_name ) %]
                                 [% savedreport.report_name %]
-- 
1.7.9.5

From oleonard at myacpl.org  Mon Aug 19 16:58:27 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 19 Aug 2013 10:58:27 -0400
Subject: [Koha-patches] [PATCH] Bug 8670 - Update POD of
	C4::Branch::GetBranches() to use TT syntax
Message-ID: <1376924307-6414-1-git-send-email-oleonard@myacpl.org>

This patch updates the example template syntax in the POD for
C4::Branch::GetBranches() to use Template Toolkit syntax.

To test, view the POD for C4::Branch::GetBranches() and confirm that it
looks correct.
---
 C4/Branch.pm |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/C4/Branch.pm b/C4/Branch.pm
index 8b76771..108f24f 100644
--- a/C4/Branch.pm
+++ b/C4/Branch.pm
@@ -90,11 +90,15 @@ Create a branch selector with the following code.
 
 =head3 in TEMPLATE
 
-    <select name="branch">
-        <option value="">Default</option>
-        <!-- TMPL_LOOP name="branchloop" -->
-        <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
-        <!-- /TMPL_LOOP -->
+    <select name="branch" id="branch">
+        <option value=""></option>
+            [% FOREACH branchloo IN branchloop %]
+                [% IF ( branchloo.selected ) %]
+                    <option value="[% branchloo.value %]" selected="selected">[% branchloo.branchname %]</option>
+                [% ELSE %]
+                    <option value="[% branchloo.value %]" >[% branchloo.branchname %]</option>
+                [% END %]
+            [% END %]
     </select>
 
 =head4 Note that you often will want to just use GetBranchesLoop, for exactly the example above.
-- 
1.7.9.5

From oleonard at myacpl.org  Mon Aug 19 17:18:51 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 19 Aug 2013 11:18:51 -0400
Subject: [Koha-patches] [PATCH] Bug 10763 - Update POD of
	C4::Creators::Lib::html_table() to use TT syntax
Message-ID: <1376925531-6916-1-git-send-email-oleonard@myacpl.org>

This patch updates the example template syntax in the POD for
C4::Creators::Lib::html_table() to use Template Toolkit syntax.

To test, view the POD for C4::Creators::Lib::html_table() and confirm
that it looks correct.
---
 C4/Creators/Lib.pm |   46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/C4/Creators/Lib.pm b/C4/Creators/Lib.pm
index d052427..6fa9bf4 100644
--- a/C4/Creators/Lib.pm
+++ b/C4/Creators/Lib.pm
@@ -479,37 +479,35 @@ sub get_table_names {
 =head2 C4::Creators::Lib::html_table()
 
 This function returns an arrayref of an array of hashes contianing the supplied data formatted suitably to
-be passed off as a T::P template parameter and used to build an html table.
+be passed off as a template parameter and used to build an html table.
 
    my $table = html_table(header_fields, array_of_row_data);
    $template->param(
-       TABLE => $table,
+       table_loop => $table,
    );
 
     html example:
 
-       <table>
-            <!-- TMPL_LOOP NAME="TABLE" -->
-            <!-- TMPL_IF NAME="header_fields" -->
-            <tr>
-            <!-- TMPL_LOOP NAME="header_fields" -->
-                <th><!-- TMPL_VAR NAME="field_label" --></th>
-            <!-- /TMPL_LOOP -->
-            </tr>
-            <!-- TMPL_ELSE -->
-            <tr>
-            <!-- TMPL_LOOP NAME="text_fields" -->
-            <!-- TMPL_IF NAME="select_field" -->
-                <td align="center"><input type="checkbox" name="action" value="<!-- TMPL_VAR NAME="field_value" -->" /></td>
-            <!-- TMPL_ELSIF NAME="field_value" -->
-                <td><!-- TMPL_VAR NAME="field_value" --></td>
-            <!-- TMPL_ELSE -->
-                <td>&nbsp;</td>
-            <!-- /TMPL_IF -->
-            <!-- /TMPL_LOOP -->
-            </tr>
-            <!-- /TMPL_IF -->
-            <!-- /TMPL_LOOP -->
+        <table>
+            [% FOREACH table_loo IN table_loop %]
+                [% IF ( table_loo.header_fields ) %]
+                    <tr>
+                        [% FOREACH header_field IN table_loo.header_fields %]
+                            <th>[% header_field.field_label %]</th>
+                        [% END %]
+                    </tr>
+                [% ELSE %]
+                    <tr>
+                        [% FOREACH text_field IN table_loo.text_fields %]
+                            [% IF ( text_field.select_field ) %]
+                                <td><input type="checkbox" name="action" value="[% text_field.field_value %]"></td>
+                            [% ELSE %]
+                                <td>[% text_field.field_value %]</td>
+                            [% END %]
+                        [% END %]
+                    </tr>
+                [% END %]
+            [% END %]
         </table>
 
 =cut
-- 
1.7.9.5

From oleonard at myacpl.org  Mon Aug 19 17:40:18 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 19 Aug 2013 11:40:18 -0400
Subject: [Koha-patches] [PATCH] Bug 10764 - Update POD of
	C4::Items::GetItemStatus() to use TT syntax
Message-ID: <1376926818-7197-1-git-send-email-oleonard@myacpl.org>

This patch updates the example template syntax in the POD for
C4::Items::GetItemStatus() to use Template Toolkit syntax.

To test, view the POD for C4::Items::GetItemStatus() and confirm that it
looks correct.
---
 C4/Items.pm |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/C4/Items.pm b/C4/Items.pm
index 212a9d3..64db262 100644
--- a/C4/Items.pm
+++ b/C4/Items.pm
@@ -751,12 +751,16 @@ Create a status selector with the following code
 
 =head3 in TEMPLATE
 
- <select name="statusloop">
-     <option value="">Default</option>
- <!-- TMPL_LOOP name="statusloop" -->
-     <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="statusname" --></option>
- <!-- /TMPL_LOOP -->
- </select>
+<select name="statusloop" id="statusloop">
+    <option value="">Default</option>
+    [% FOREACH statusloo IN statusloop %]
+        [% IF ( statusloo.selected ) %]
+            <option value="[% statusloo.value %]" selected="selected">[% statusloo.statusname %]</option>
+        [% ELSE %]
+            <option value="[% statusloo.value %]">[% statusloo.statusname %]</option>
+        [% END %]
+    [% END %]
+</select>
 
 =cut
 
-- 
1.7.9.5

From oleonard at myacpl.org  Mon Aug 19 18:08:12 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 19 Aug 2013 12:08:12 -0400
Subject: [Koha-patches] [PATCH] Bug 10765 - Update POD of
	C4::Koha::GetSupportList() to use TT syntax
Message-ID: <1376928492-8251-1-git-send-email-oleonard@myacpl.org>

This patch updates the example template syntax in the POD for
C4::Koha::GetSupportList() to use Template Toolkit syntax.

To test, view the POD for  C4::Koha::GetSupportList() and confirm that
it looks correct.
---
 C4/Koha.pm |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index ea8c2a6..6f91b8b 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -174,16 +174,16 @@ build a HTML select with the following code :
 
 =head3 in TEMPLATE
 
-    <form action='<!-- TMPL_VAR name="script_name" -->' method=post>
-        <select name="itemtype">
-            <option value="">Default</option>
-        <!-- TMPL_LOOP name="itemtypeloop" -->
-            <option value="<!-- TMPL_VAR name="itemtype" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->> <!--TMPL_IF Name="imageurl"--><img alt="<!-- TMPL_VAR name="description" -->" src="<!--TMPL_VAR Name="imageurl"-->><!--TMPL_ELSE-->"<!-- TMPL_VAR name="description" --><!--/TMPL_IF--></option>
-        <!-- /TMPL_LOOP -->
-        </select>
-        <input type=text name=searchfield value="<!-- TMPL_VAR name="searchfield" -->">
-        <input type="submit" value="OK" class="button">
-    </form>
+    <select name="itemtype" id="itemtype">
+        <option value=""></option>
+        [% FOREACH itemtypeloo IN itemtypeloop %]
+             [% IF ( itemtypeloo.selected ) %]
+                <option value="[% itemtypeloo.itemtype %]" selected="selected">[% itemtypeloo.description %]</option>
+            [% ELSE %]
+                <option value="[% itemtypeloo.itemtype %]">[% itemtypeloo.description %]</option>
+            [% END %]
+       [% END %]
+    </select>
 
 =cut
 
-- 
1.7.9.5

From oleonard at myacpl.org  Mon Aug 19 18:35:58 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 19 Aug 2013 12:35:58 -0400
Subject: [Koha-patches] [PATCH] Bug 3934 - move test prediction pattern
	button
Message-ID: <1376930158-8674-1-git-send-email-oleonard@myacpl.org>

On the subscription add/edit screen the buttons related to numbering
patterns are grouped with the "save" button, which is potentially
confusing. This patch moves the buttons into the "serials planning"
region so they are visually grouped with related functionality.

Unrelated changes: Removed a few redundant "javascript:"
pseudo-protocols from event handlers, and added a "Cancel" link.

To test, edit an existing subscription and confirm that the prediction
pattern buttons are grouped inside the "serials planning" region.
Confirm that each button triggers the correct event. Confirm that
clicking the "cancel" link returns you to the subscription detail view.

Also test creating a new subscription. Again buttons should work
correctly. The "Cancel" link should return you to the Serials module
home page.
---
 .../prog/en/modules/serials/subscription-add.tt    |   29 ++++++++++++--------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
index 14f01ef..025b8b8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt
@@ -1145,7 +1145,7 @@ $(document).ready(function() {
                 
         <li>
             <label for="periodicity" class="required">Frequency:</label>
-                <select name="periodicity" size="1" id="periodicity" onchange="javascript:document.getElementsByName('manualhist')[0].checked=(this.value==1); reset_num_pattern();">
+                <select name="periodicity" size="1" id="periodicity" onchange="document.getElementsByName('manualhist')[0].checked=(this.value==1); reset_num_pattern();">
                 <option value="" selected="selected">-- please choose --</option>
                 [% IF ( periodicity16 ) %]
                 <option value="16" selected="selected">Without periodicity</option>
@@ -1312,20 +1312,11 @@ $(document).ready(function() {
     <li><label for="numberingmethod">Numbering formula:</label> <input type="text" name="numberingmethod" id="numberingmethod" value="[% numberingmethod %]" />
     </li>
     </ol>
-	</fieldset>
 
-	<fieldset class="action">
-    <input type="button" class="action_test" value="Test prediction pattern" onclick="javascript:irregularity_check()" />
-    <input type="button" class="action_reset" value="Reset pattern" onclick="javascript:reset_pattern()" />
-    <input type="button" class="action_save"  value="Save subscription" onclick="Check(this.form)" accesskey="w" />
-	</fieldset>
-    <fieldset class="action">
-    <input type="button" class="action_advanced" value="Show/Hide advanced pattern" onclick="javascript:display_table()" />
-    </fieldset>
            <div id="basetable"  style="display: none;">
             <table class="small">
                 <tr><th colspan="4">Advanced prediction pattern</th></tr>
-				<tr>
+                <tr>
                     <th>&nbsp;</th>
                     <th>X</th>
                     <th>Y</th>
@@ -1382,6 +1373,22 @@ $(document).ready(function() {
             </table>
         </div>
 
+    <fieldset class="action">
+        <input type="button" class="action_test" value="Test prediction pattern" onclick="irregularity_check()" />
+        <input type="button" class="action_reset" value="Reset pattern" onclick="reset_pattern()" />
+        <input type="button" class="action_advanced" value="Show/Hide advanced pattern" onclick="display_table()" />
+    </fieldset>
+    </fieldset>
+
+    <fieldset class="action">
+    <input type="button" class="action_save"  value="Save subscription" onclick="Check(this.form)" accesskey="w" />
+    [% IF ( subscriptionid ) %]
+       <a href="/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=[% subscriptionid %]" class="cancel">Cancel</a>
+    [% ELSE %]
+        <a href="/cgi-bin/koha/serials/serials-home.pl" class="cancel">Cancel</a>
+    [% END %]
+    </fieldset>
+
 </div>
 </div>
 </form>
-- 
1.7.9.5


From oleonard at myacpl.org  Mon Aug 19 21:15:01 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Mon, 19 Aug 2013 15:15:01 -0400
Subject: [Koha-patches] [PATCH] Bug 10130 - Input fields for branch
	configuration are too short
Message-ID: <1376939701-9560-1-git-send-email-oleonard@myacpl.org>

Most input fields in the library entry form (admin/branches.pl) have no
explicit with, so they display with a browser-default width. This patch
gives explicit widths to those fields, giving more room for entry.

Other fields have been given an explicit width and/or maxwidth according
to the database table structure.

To test, add or edit a library in Administration -> Libraries and
Groups. Form fields should be more comfortable for entry, and add/edit
actions should complete correctly.
---
 .../prog/en/modules/admin/branches.tt              |   28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index 86fb8ce..5bf9567 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -92,7 +92,7 @@ tinyMCE.init({
             <label for="branchcode" class="required">Library code: </label>
                 <input type="text" name="branchcode" id="branchcode" size="10" maxlength="10" value="[% branchcode |html %]" class="required" required="required" /> <span class="required">Required</span>
             [% ELSE %]
-            <label for="branchcode" class="required">Library code: </label>
+            <span class="label">Library code: </span>
                 <input type="hidden" name="branchcode" value="[% branchcode |html %]" />
                 [% branchcode %]
             [% END %]
@@ -119,19 +119,19 @@ tinyMCE.init({
 </fieldset>[% END %]
 	<fieldset class="rows">
 	<ol>
-        <li><label for="branchaddress1">Address line 1: </label><input type="text" name="branchaddress1" id="branchaddress1" value="[% branchaddress1 |html %]" /></li>
-        <li><label for="branchaddress2">Address line 2: </label><input type="text" name="branchaddress2" id="branchaddress2" value="[% branchaddress2 |html %]" /></li>
-        <li><label for="branchaddress3">Address line 3: </label><input type="text" name="branchaddress3" id="branchaddress3" value="[% branchaddress3 |html %]" /></li>
-        <li><label for="branchcity">City: </label><input type="text" name="branchcity" id="branchcity" value="[% branchcity |html %]" /></li>
-        <li><label for="branchstate">State: </label><input type="text" name="branchstate" id="branchstate" value="[% branchstate |html %]" /></li>
-        <li><label for="branchzip">Zip/Postal code: </label><input type="text" name="branchzip" id="branchzip" value="[% branchzip |html %]" /></li>
-        <li><label for="branchcountry">Country: </label><input type="text" name="branchcountry" id="branchcountry" value="[% branchcountry |html %]" /></li>
-        <li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" value="[% branchphone |html %]" /></li>
-        <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" value="[% branchfax |html %]" /></li>
-        <li><label for="branchemail">Email: </label><input type="text" name="branchemail" id="branchemail" class="email" value="[% branchemail |html %]" /></li>
-        <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl" value="[% branchurl |html %]" class="url" /></li>
+        <li><label for="branchaddress1">Address line 1: </label><input type="text" name="branchaddress1" id="branchaddress1" size="60" value="[% branchaddress1 |html %]" /></li>
+        <li><label for="branchaddress2">Address line 2: </label><input type="text" name="branchaddress2" id="branchaddress2" size="60" value="[% branchaddress2 |html %]" /></li>
+        <li><label for="branchaddress3">Address line 3: </label><input type="text" name="branchaddress3" id="branchaddress3" size="60" value="[% branchaddress3 |html %]" /></li>
+        <li><label for="branchcity">City: </label><input type="text" name="branchcity" id="branchcity" size="60" value="[% branchcity |html %]" /></li>
+        <li><label for="branchstate">State: </label><input type="text" name="branchstate" id="branchstate" size="60" value="[% branchstate |html %]" /></li>
+        <li><label for="branchzip">Zip/Postal code: </label><input type="text" name="branchzip" id="branchzip"  size="25" maxlength="25" value="[% branchzip |html %]" /></li>
+        <li><label for="branchcountry">Country: </label><input type="text" name="branchcountry" id="branchcountry" size="60" value="[% branchcountry |html %]" /></li>
+        <li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% branchphone |html %]" /></li>
+        <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% branchfax |html %]" /></li>
+        <li><label for="branchemail">Email: </label><input type="text" name="branchemail" id="branchemail" class="email"  size="80" value="[% branchemail |html %]" /></li>
+        <li><label for="branchurl">URL: </label><input type="text" name="branchurl" id="branchurl"  size="80" value="[% branchurl |html %]" class="url" /></li>
         <li><label for="opac_info">OPAC info: </label><textarea name="opac_info" id="opac_info">[% opac_info |html %]</textarea></li>
-        <li><label for="branchip">IP: </label><input type="text" name="branchip" id="branchip" value="[% branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
+        <li><label for="branchip">IP: </label><input type="text" name="branchip" id="branchip"  size="15" maxlength="15" value="[% branchip |html %]" /> <span class="hint">Can be entered as a single IP, or a subnet such as 192.168.1.*</span></li>
 		<!--
         <li><label for="branchprinter">Library Printer: </label>
             <select id="branchprinter" name="branchprinter">
@@ -145,7 +145,7 @@ tinyMCE.init({
                 [% END %]
             </select></li>
 			-->
-        <li><label for="branchnotes">Notes: </label><input type="text" name="branchnotes" id="branchnotes" value="[% branchnotes |html %]" /></li>
+        <li><label for="branchnotes">Notes: </label><input type="text" name="branchnotes" id="branchnotes" size="80" value="[% branchnotes |html %]" /></li>
         </ol>
         </fieldset>
         <fieldset class="action"><input type="submit" value="Submit" /> <a class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a></fieldset>
-- 
1.7.9.5

From oleonard at myacpl.org  Tue Aug 20 15:30:20 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Tue, 20 Aug 2013 09:30:20 -0400
Subject: [Koha-patches] [PATCH] Bug 10769 - Simplify clearing of input
	fields when duplicating a patron
Message-ID: <1377005420-12377-1-git-send-email-oleonard@myacpl.org>

When duplicating a patron record an onclick event is added to many
fields in order to make then clear when focused. This patch updates the
template so that the logic for this can be simplified. A template
variable is set based on the 'opduplicate' variable, and a class added
to the relevant fields. All fields with that class are cleared on focus.

Also changed are several markup issues which were causing validation
errors.

To test, find or create a patron record which has all standard text
fields filled with data. Use the "duplicate" button on the detail view
of that patron to initiate the duplication process.

Focus on each field in the patron entry form in succession. Fields which
contain data should be cleared in the same way they were before the
patch.

Also test a regular edit operation to confirm that fields are not
cleared.
---
 .../prog/en/modules/members/memberentrygen.tt      |  265 +++++---------------
 1 file changed, 58 insertions(+), 207 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 7a2d29e..2cb1bb3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1,3 +1,4 @@
+[% IF ( opduplicate ) %][% SET focusAction = "clearDupe" %][% END %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Patrons &rsaquo; 
 [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] [% IF ( categoryname ) %] [% categoryname %] patron[% ELSE %][% IF ( I ) %] Organization patron[% END %][% IF ( A ) %] Adult patron[% END %][% IF ( C ) %] Child patron[% END %][% IF ( P ) %] Professional patron[% END %][% IF ( S ) %] Staff patron[% END %][% END %][% UNLESS ( opadd ) %] [% surname %], [% firstname %][% END %]</title>
@@ -23,6 +24,9 @@
             document.form.state.value=RegExp.$3;
             document.form.country.value=RegExp.$4;
         });
+        $(".clearDupe").on("focus",function(){
+            $(this).val("");
+        })
 
         [% IF categorycode %]
             update_category_code( "[% categorycode %]" );
@@ -102,7 +106,6 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-
     [% IF error_alert %]
         [% IF ( error_alert == "no_email" ) %]
             <div class="error">This member has no email</div>
@@ -238,17 +241,9 @@
 		[% END %]
 		Surname: </label>
 		[% IF ( uppercasesurnames ) %]
-			[% IF ( opduplicate ) %]
-				<input style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20"  value="[% surname %]" onclick="this.value=''" />
-			[% ELSE %]
-				<input style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20"  value="[% surname %]" />
-			[% END %]
+            <input style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20"  value="[% surname %]" class="[% focusAction %]" />
 		[% ELSE %]
-			[% IF ( opduplicate ) %]
-				<input type="text" id="surname" name="surname" size="20"  value="[% surname %]" onclick="this.value=''" />
-			[% ELSE %]
-				<input type="text" id="surname" name="surname" size="20"  value="[% surname %]" />
-			[% END %]
+            <input type="text" id="surname" name="surname" size="20"  value="[% surname %]" class="[% focusAction %]" />
 		[% END %]
 		[% IF ( mandatorysurname ) %]<span class="required">Required</span>[% END %]
 		</li>
@@ -294,11 +289,7 @@
                     <label for="initials">
                 [% END %]
                 Initials: </label>
-                [% IF ( opduplicate ) %]
-					<input type="text" id="initials" name="initials" size="20"  value="[% initials %]" onclick="this.value=''" />
-                [% ELSE %]
-					<input type="text" id="initials" name="initials" size="20"  value="[% initials %]" />
-                [% END %]
+                <input type="text" id="initials" name="initials" size="20"  value="[% initials %]" class="[% focusAction %]" />
                 [% IF ( mandatoryinitials ) %]<span class="required">Required</span>[% END %]
             </li>
         [% END %]
@@ -310,12 +301,8 @@
 			[% ELSE %]
 			<label for="othernames">
 			[% END %]
-			Other name: </label>
-			[% IF ( opduplicate ) %]
-				<input type="text" id="othernames" name="othernames" size="20"  value="[% othernames %]" onclick="this.value=''" />
-			[% ELSE %]
-				<input type="text" id="othernames" name="othernames" size="20"  value="[% othernames %]" />
-			[% END %]
+            Other name: </label>
+            <input type="text" id="othernames" name="othernames" size="20"  value="[% othernames %]" class="[% focusAction %]" />
 [% IF ( mandatoryothernames ) %]<span class="required">Required</span>[% END %]
 		[% IF ( I ) %]<input type="hidden" name="sex" value="N" />[% END %]
 		</li>
@@ -364,11 +351,7 @@
 	            <span>[% contactname %]</span>
 	            <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname %]" />
 	            [% ELSE %]
-		            [% IF ( opduplicate ) %]
-						<input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" onclick="this.value=''" />
-		            [% ELSE %]
-						<input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" />
-		            [% END %]
+                    <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" class="[% focusAction %]" />
 	            [% END %]
 	        </li>
 [% ELSE %]
@@ -387,11 +370,7 @@
      <span>[% contactname %]</span>
      <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname %]" />
      [% ELSE %]
-		[% IF ( opduplicate ) %]
-			<input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" onclick="this.value=''" />
-		[% ELSE %]
-			<input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" />
-		[% END %]
+        <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" class="[% focusAction %]" />
      [% END %]
  </li>
         [% END %]
@@ -402,11 +381,7 @@
      <span>[% contactfirstname %]</span>
      <input name="contactfirstname" id="contactfirstname" type="hidden" size="20" value="[% contactfirstname %]" />
      [% ELSE %]
-	     [% IF ( opduplicate ) %]
-				<input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname %]" onclick="this.value=''" />
-	     [% ELSE %]
-				<input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname %]" />
-	     [% END %]
+        <input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname %]" class="[% focusAction %]" />
      [% END %]
  </li>
         [% END %]
@@ -450,11 +425,7 @@
       <label for="streetnumber">
       [% END %]
       Street number: </label>
-      [% IF ( opduplicate ) %]
-		<input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" onclick="this.value=''" />
-      [% ELSE %]
-		<input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
-      [% END %]
+        <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" class="[% focusAction %]" />
 [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -480,11 +451,7 @@
       <label for="address">
       [% END %]
       Address: </label>
-      [% IF ( opduplicate ) %]
-			<input type="text" id="address" name="address" size="35" value="[% address %]" onclick="this.value=''" />
-      [% ELSE %]
-			<input type="text" id="address" name="address" size="35" value="[% address %]" />
-      [% END %]
+            <input type="text" id="address" name="address" size="35" value="[% address %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -496,11 +463,7 @@
       <label for="address2">
       [% END %]
       Address 2: </label>
-      [% IF ( opduplicate ) %]
-			<input type="text" id="address2" name="address2" size="35" value="[% address2 %]" onclick="this.value=''" />
-      [% ELSE %]
-			<input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
-      [% END %]
+            <input type="text" id="address2" name="address2" size="35" value="[% address2 %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
     </li>  
         [% END %]
@@ -512,11 +475,7 @@
         <label for="city">
       [% END %]
       City: </label>
-        [% IF ( opduplicate ) %]
-			<input type="text" id="city" name="city" size="20" value="[% city %]" onclick="this.value=''" />
-        [% ELSE %]
-			<input type="text" id="city" name="city" size="20" value="[% city %]" />
-        [% END %]
+        <input type="text" id="city" name="city" size="20" value="[% city %]" class="[% focusAction %]" />
         [% IF ( city_cgipopup ) %]or <strong>choose</strong>
         <select id="select_city" name="select_city">
         [% FOREACH city_loo IN city_loop %]
@@ -541,7 +500,7 @@
         <label for="state">
       [% END %]
       State: </label>
-      <input type="text" name="state" id="state" size="20" value="[% state %]" />
+      <input type="text" name="state" id="state" size="20" value="[% state %]" class="[% focusAction %]" />
 	  [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -553,11 +512,7 @@
         <label for="zipcode">
       [% END %]
       Zip/Postal code: </label>
-      [% IF ( opduplicate ) %]
-			<input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" onclick="this.value=''" />
-      [% ELSE %]
-			<input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" />
-      [% END %]
+            <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -569,11 +524,7 @@
         <label for="country">
       [% END %]
       Country: </label>
-      [% IF ( opduplicate ) %]
-			<input type="text" name="country" id="country" size="20" value="[% country %]" onclick="this.value=''" />
-      [% ELSE %]
-			<input type="text" name="country" id="country" size="20" value="[% country %]" />
-      [% END %]
+        <input type="text" name="country" id="country" size="20" value="[% country %]" class="[% focusAction %]" />
 	  [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
     </li>    
         [% END %]
@@ -592,11 +543,7 @@
       <label for="phone">
       [% END %]
       Primary phone: </label>
-      [% IF ( opduplicate ) %]
-			<input type="text" id="phone" name="phone" value="[% phone %]" onclick="this.value=''" />
-      [% ELSE %]
-			<input type="text" id="phone" name="phone" value="[% phone %]" />
-      [% END %]
+        <input type="text" id="phone" name="phone" value="[% phone %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
 
     </li>
@@ -609,11 +556,7 @@
       <label for="phonepro">
       [% END %]
       Secondary phone: </label>
-      [% IF ( opduplicate ) %]
-			<input type="text" id="phonepro" name="phonepro" value="[% phonepro %]" onclick="this.value=''" />
-      [% ELSE %]
-			<input type="text" id="phonepro" name="phonepro" value="[% phonepro %]" />
-      [% END %]
+    <input type="text" id="phonepro" name="phonepro" value="[% phonepro %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -625,11 +568,7 @@
       <label for="mobile">
       [% END %]
       Other phone: </label>
-      [% IF ( opduplicate ) %]
-		<input type="text" id="mobile" name="mobile" value="[% mobile %]" onclick="this.value=''" />
-      [% ELSE %]
-		<input type="text" id="mobile" name="mobile" value="[% mobile %]" />
-      [% END %]
+        <input type="text" id="mobile" name="mobile" value="[% mobile %]" class="[% focusAction %]" />
 	  [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -641,11 +580,7 @@
       <label for="email">
       [% END %]
       Primary email: </label>
-      [% IF ( opduplicate ) %]
-		<input type="text" id="email" name="email" size="45" value="[% email %]" onclick="this.value=''" />
-      [% ELSE %]
-		<input type="text" id="email" name="email" size="45" value="[% email %]" />
-      [% END %]
+        <input type="text" id="email" name="email" size="45" value="[% email %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
 
     </li>
@@ -658,11 +593,7 @@
       <label for="emailpro">
       [% END %]
       Secondary email: </label>
-      [% IF ( opduplicate ) %]
-		<input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro %]" onclick="this.value=''" />
-      [% ELSE %]
-		<input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro %]" />
-      [% END %]
+        <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -674,11 +605,7 @@
       <label for="fax">
       [% END %]
       Fax: </label>
-      [% IF ( opduplicate ) %]
-		<input type="text" id="fax" name="fax" value="[% fax %]" onclick="this.value=''" />
-      [% ELSE %]
-		<input type="text" id="fax" name="fax" value="[% fax %]" />
-      [% END %]
+        <input type="text" id="fax" name="fax" value="[% fax %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -701,11 +628,7 @@
 					<label for="B_address">
 				[% END %]
 				Address: </label>
-				[% IF ( opduplicate ) %]
-					<input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" onclick="this.value=''" />
-				[% ELSE %]
-					<input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
-				[% END %]
+                    <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -717,11 +640,7 @@
 					<label for="B_address2">
 				[% END %]
 				Address 2: </label>
-				[% IF ( opduplicate ) %]
-					<input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" onclick="this.value=''" />
-				[% ELSE %]
-					<input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
-				[% END %]
+                    <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -733,7 +652,7 @@
 					<label for="B_city">
 				[% END %]
 				City: </label>
-				<input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
+                <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -745,7 +664,7 @@
 					<label for="B_state">
 				[% END %]
 				State: </label>
-				<input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
+                <input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -757,11 +676,7 @@
 					<label for="B_zipcode">
 				[% END %]
 				Zip/Postal code: </label>
-				[% IF ( opduplicate ) %]
-					<input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" onclick="this.value=''" />
-				[% ELSE %]
-					<input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" />
-				[% END %]
+                    <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -773,11 +688,7 @@
 					<label for="B_country">
 				[% END %]
 				Country: </label>
-				[% IF ( opduplicate ) %]
-					<input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" onclick="this.value=''" />
-				[% ELSE %]
-					<input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
-				[% END %]
+                    <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -789,11 +700,7 @@
                 <label for="B_phone">
                 [% END %]
                 Phone: </label>
-                [% IF ( opduplicate ) %]
-					<input type="text" id="B_phone" name="B_phone" value="[% B_phone %]" onclick="this.value=''" />
-                [% ELSE %]
-					<input type="text" id="B_phone" name="B_phone" value="[% B_phone %]" />
-                [% END %]
+                    <input type="text" id="B_phone" name="B_phone" value="[% B_phone %]" class="[% focusAction %]" />
                 [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
             </li>
         [% END %]
@@ -805,11 +712,7 @@
           <label for="B_email">
         [% END %]
         Email: </label>
-        [% IF ( opduplicate ) %]
-			<input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" onclick="this.value=''" />
-        [% ELSE %]
-			<input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
-		[% END %]
+            <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" class="[% focusAction %]" />
 		[% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
         [% END %]
         [% UNLESS nocontactnote %]
@@ -840,11 +743,7 @@
 				<label for="altcontactsurname">
 				[% END %]
 				Surname:</label>
-				[% IF ( opduplicate ) %]
-					<input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" onclick="this.value=''" />
-				[% ELSE %]
-					<input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
-				[% END %]
+                    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -856,11 +755,7 @@
 				<label for="altcontactfirstname">
 				[% END %]
 				First name:</label>
-				[% IF ( opduplicate ) %]
-					<input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" onclick="this.value=''" />
-				[% ELSE %]
-					<input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
-				[% END %]
+                    <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -872,11 +767,7 @@
 				<label for="altcontactaddress1">
 				[% END %]
 				Address:</label>
-				[% IF ( opduplicate ) %]
-					<input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" onclick="this.value=''" size="40" />
-				[% ELSE %]
-					<input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
-				[% END %]
+                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -888,11 +779,7 @@
 				<label for="altcontactaddress2">
 				[% END %]
 				Address 2:</label>
-				[% IF ( opduplicate ) %]
-					<input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" onclick="this.value=''" size="40" />
-				[% ELSE %]
-					<input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
-				[% END %]
+                <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -904,7 +791,7 @@
 				<label for="altcontactaddress3">
 				[% END %]
 				City:</label>
-				<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
+                <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -916,7 +803,7 @@
 				<label for="altcontactstate">
 				[% END %]
 				State:</label>
-				<input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
+                <input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -928,11 +815,7 @@
 				<label for="altcontactzipcode">
 				[% END %]
 				Zip/Postal code:</label>
-				[% IF ( opduplicate ) %]
-					<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" onclick="this.value=''" size="5" />
-				[% ELSE %]
-					<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" />
-				[% END %]
+                    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -944,11 +827,7 @@
 				<label for="altcontactcountry">
 				[% END %]
 				Country:</label>
-				[% IF ( opduplicate ) %]
-					<input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" onclick="this.value=''" size="20" />
-				[% ELSE %]
-					<input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
-				[% END %]
+                    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
 			</li>			
         [% END %]
@@ -960,11 +839,7 @@
 				<label for="altcontactphone">
 				[% END %]
 				Phone:</label>
-				[% IF ( opduplicate ) %]
-					<input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" onclick="this.value=''" />
-				[% ELSE %]
-					<input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
-				[% END %]
+                    <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -989,8 +864,8 @@
         [% END %]
         [% UNLESS nobranchcode %]
     <li>
-        <label for="branchcode" class="required">Library:</label>
-        <select name="branchcode" size="1" id="branchcode">
+        <label for="libraries" class="required">Library:</label>
+        <select name="branchcode" size="1" id="libraries">
         [%- FOREACH branchloo IN branchloop %]
           [% IF ( branchloo.selected ) -%]
             <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
@@ -1008,12 +883,12 @@
         [% FOREACH typeloo IN typeloop %]
             [% FOREACH categoryloo IN typeloo.categoryloop %]
                 [% IF ( loop.first ) %]
-                    [% IF ( typeloo.typename_C ) %]<optgroup label="Child"        value="C">[% END %]
-                    [% IF ( typeloo.typename_A ) %]<optgroup label="Adult"        value="A">[% END %]
-                    [% IF ( typeloo.typename_S ) %]<optgroup label="Staff"        value="S">[% END %]
-                    [% IF ( typeloo.typename_I ) %]<optgroup label="Organization" value="I">[% END %]
-                    [% IF ( typeloo.typename_P ) %]<optgroup label="Professional" value="P">[% END %]
-                    [% IF ( typeloo.typename_X ) %]<optgroup label="Statistical"  value="X">[% END %]
+                    [% IF ( typeloo.typename_C ) %]<optgroup label="Child">[% END %]
+                    [% IF ( typeloo.typename_A ) %]<optgroup label="Adult">[% END %]
+                    [% IF ( typeloo.typename_S ) %]<optgroup label="Staff">[% END %]
+                    [% IF ( typeloo.typename_I ) %]<optgroup label="Organization">[% END %]
+                    [% IF ( typeloo.typename_P ) %]<optgroup label="Professional">[% END %]
+                    [% IF ( typeloo.typename_X ) %]<optgroup label="Statistical">[% END %]
                 [% END %]
                 [% IF ( categoryloo.categorycodeselected ) %]
                     <option value="[% categoryloo.categorycode %]" selected="selected" data-typename="[% typeloo.typename %]">[% categoryloo.categoryname %]</option>
@@ -1039,11 +914,7 @@
       [% IF ( CGIsort1 ) %] 
         [% CGIsort1 %]
       [% ELSE %]
-          [% IF ( opduplicate ) %]
-            <input  type="text" id="sort1" name="sort1" size="20"  value="[% sort1 %]" onclick="this.value=''" />
-          [% ELSE %]
-            <input  type="text" id="sort1" name="sort1" size="20"  value="[% sort1 %]" />
-          [% END %]
+            <input type="text" id="sort1" name="sort1" size="20" value="[% sort1 %]" class="[% focusAction %]" />
 	  [% IF ( mandatorysort1 ) %]<span class="required">Required</span>[% END %]
       [% END %]   
     </li>
@@ -1059,11 +930,7 @@
     [% IF ( CGIsort2 ) %] 
       [% CGIsort2 %]
     [% ELSE %]
-      [% IF ( opduplicate ) %]
-		<input  type="text" id="sort2" name="sort2" size="20"  value="[% sort2 %]" onclick="this.value=''" />
-      [% ELSE %]
-		<input  type="text" id="sort2" name="sort2" size="20"  value="[% sort2 %]" />
-      [% END %]
+        <input type="text" id="sort2" name="sort2" size="20" value="[% sort2 %]" class="[% focusAction %]" />
 	  [% IF ( mandatorysort2 ) %]<span class="required">Required</span>[% END %]
     [% END %] 
     </li>
@@ -1308,20 +1175,12 @@
 				[% END %]
 
                 <span id="debarreduntil"><label for="datedebarred" class="inline">Until:</label>
-                                [% IF opduplicate %]
-                                    <input type="text" name="datedebarred" id="datedebarred" class="debarred datepicker" value="[% datedebarred %]" onclick="this.value=''" />
-                                [% ELSE %]
-                                    <input type="text" name="datedebarred" id="datedebarred" class="debarred datepicker" value="[% datedebarred %]" />
-                                [% END %]
+                <input type="text" name="datedebarred" id="datedebarred" class="debarred datepicker [% focusAction %]" value="[% datedebarred %]" />
                 <span class="hint">(optional)</span> </span>
                 </li>
                 <li>
 		        <label for="debarredcomment" class="radio">Comment:</label>
-			       [% IF ( opduplicate ) %] 
-			           <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" onclick="this.value=''">[% debarredcomment %]</textarea>
-			       [% ELSE %]
-				   <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3">[% debarredcomment %]</textarea>
-			       [% END %]
+                <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3">[% debarredcomment %]</textarea>
 	        </li>
 
 			</ol>
@@ -1333,8 +1192,8 @@
 
 [% IF ( step_4 ) %][% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %]
   <fieldset class="rows" id="memberentry_patron_attributes">
-    <input type="hidden" name="setting_extended_patron_attributes" value="1" />
     <legend>Additional attributes and identifiers</legend>
+    <input type="hidden" name="setting_extended_patron_attributes" value="1" />
     [% FOREACH pa_loo IN patron_attributes %]
         [% IF pa_loo.class %]
             <fieldset id="aai_[% pa_loo.class %]">
@@ -1347,7 +1206,7 @@
                         <input type="hidden" id="[% patron_attribute.form_id %]_code" name="[% patron_attribute.form_id %]_code" value="[% patron_attribute.code |html %]" />
                         [% IF ( patron_attribute.use_dropdown ) %]
                             <select id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]">
-                                <option value="" />
+                                <option value=""></option>
                                 [% FOREACH auth_val_loo IN patron_attribute.auth_val_loop %]
                                     [% IF ( auth_val_loo.selected ) %]
                                         <option value="[% auth_val_loo.authorised_value %]" selected="selected">
@@ -1361,11 +1220,7 @@
                                 [% END %]
                             </select>
                         [% ELSE %]
-                            [% IF ( opduplicate ) %]
-                            <textarea rows="2" cols="30" id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]" onclick="this.value=''" >[% patron_attribute.value %]</textarea>
-                            [% ELSE %]
                             <textarea rows="2" cols="30" id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]">[% patron_attribute.value %]</textarea>
-                            [% END %]
                         [% END %]
                         [% IF ( patron_attribute.password_allowed ) %]
                             (<label class="yesno" for="[% patron_attribute.form_id %]_password">Password:</label> <input type="password" maxlength="64" value="[% patron_attribute.password %]"
@@ -1385,6 +1240,7 @@
 
 [% IF ( step_5 ) %][% IF ( EnhancedMessagingPreferences ) %]
   <fieldset class="rows" id="memberentry_messaging_prefs">
+    <legend id="patron_messaging_prefs_lgd">Patron messaging preferences</legend>
     [% IF ( opadd ) %]
     <!-- handle changing prefs if creating new patron and changing
          the patron category
@@ -1432,18 +1288,13 @@
     </script>
     [% END %]
     <input type="hidden" name="setting_messaging_prefs" value="1" />
-    <legend id="patron_messaging_prefs_lgd">Patron messaging preferences</legend>
     [% IF type_only %]
         <p>If no preferences are selected, the default preferences for the category chosen will be applied on save, otherwise your selection here is saved</p>
     [% END %]
     [% INCLUDE 'messaging-preference-form.inc' %]
     [% IF ( SMSSendDriver ) %]
         <p><label for="SMSnumber">SMS number:</label>
-          [% IF ( opduplicate ) %]
-            <input type="text" id="SMSnumber" name="SMSnumber" value="[% SMSnumber %]" onclick="this.value=''" />
-          [% ELSE %]
-            <input type="text" id="SMSnumber" name="SMSnumber" value="[% SMSnumber %]" />
-        [% END %]
+            <input type="text" id="SMSnumber" name="SMSnumber" value="[% SMSnumber %]" class="[% focusAction %]" />
         </p>
     [% END %]
   </fieldset>
-- 
1.7.9.5

From srdjan at catalyst.net.nz  Wed Aug 21 02:53:54 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Wed, 21 Aug 2013 12:53:54 +1200
Subject: [Koha-patches] [PATCH] Bug 10426 Remove unused sub GetCcodes from
	Koha.pm
Message-ID: <1377046434-5895-1-git-send-email-srdjan@catalyst.net.nz>

From: Colin Campbell <colin.campbell at ptfs-europe.com>

Remove uncalled sub GetCcodes

Also remove comment in opac-search.pl which is
remaining reference to it and serves no
useful purpose

Signed-off-by: Srdjan <srdjan at catalyst.net.nz>
---
 C4/Koha.pm          | 22 ----------------------
 opac/opac-search.pl |  4 ----
 2 files changed, 26 deletions(-)

diff --git a/C4/Koha.pm b/C4/Koha.pm
index 6f91b8b..3fb5a70 100644
--- a/C4/Koha.pm
+++ b/C4/Koha.pm
@@ -41,7 +41,6 @@ BEGIN {
 		&subfield_is_koha_internal_p
 		&GetPrinters &GetPrinter
 		&GetItemTypes &getitemtypeinfo
-		&GetCcodes
 		&GetSupportName &GetSupportList
 		&get_itemtypeinfos_of
 		&getframeworks &getframeworkinfo
@@ -286,27 +285,6 @@ END_SQL
     return get_infos_of( $query, 'itemtype', undef, \@itemtypes );
 }
 
-# this is temporary until we separate collection codes and item types
-sub GetCcodes {
-    my $count = 0;
-    my @results;
-    my $dbh = C4::Context->dbh;
-    my $sth =
-      $dbh->prepare(
-        "SELECT * FROM authorised_values ORDER BY authorised_value");
-    $sth->execute;
-    while ( my $data = $sth->fetchrow_hashref ) {
-        if ( $data->{category} eq "CCODE" ) {
-            $count++;
-            $results[$count] = $data;
-
-            #warn "data: $data";
-        }
-    }
-    $sth->finish;
-    return ( $count, @results );
-}
-
 =head2 getauthtypes
 
   $authtypes = &getauthtypes();
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index 7d2b7a6..76f4fda 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -246,10 +246,6 @@ foreach my $advanced_srch_type (@advanced_search_types) {
 }
 $template->param(advancedsearchesloop => \@advancedsearchesloop);
 
-# # load the itypes (Called item types in the template -- just authorized values for searching)
-# my ($itypecount, at itype_loop) = GetCcodes();
-# $template->param(itypeloop=>\@itype_loop,);
-
 # The following should only be loaded if we're bringing up the advanced search template
 if ( $template_type && $template_type eq 'advsearch' ) {
     # load the servers (used for searching -- to do federated searching, etc.)
-- 
1.8.1.2

From oleonard at myacpl.org  Wed Aug 21 16:59:42 2013
From: oleonard at myacpl.org (Owen Leonard)
Date: Wed, 21 Aug 2013 10:59:42 -0400
Subject: [Koha-patches] [PATCH] Bug 2693 - Tagging: Add filter by name
Message-ID: <1377097182-22960-1-git-send-email-oleonard@myacpl.org>

If you want to filter results on the tags management page by the
reviewer you have to know their borrowernumber. It would be better to be
able to search by name, but in the meantime this patch adds an
autocomplete widget to the form field so that you can do a name search
and populate the field with the borrowernumber.

To test you must have approved or rejected tags. From the tags review
page (tags/review.pl), view all, approved, or rejected tags. Type a name
in the "reviewer" form field in the left sidebar filter. You should get
an autocomplete dropdown with names matching your search. When you
select one the form field should be populated by the borrowernumber.
---
 circ/ysearch.pl                                    |    5 +++--
 .../intranet-tmpl/prog/en/modules/tags/review.tt   |   15 +++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/circ/ysearch.pl b/circ/ysearch.pl
index 8a48c51..c57bb38 100755
--- a/circ/ysearch.pl
+++ b/circ/ysearch.pl
@@ -44,7 +44,7 @@ if ($auth_status ne "ok") {
 }
 
 my $dbh = C4::Context->dbh;
-my $sql = qq(SELECT surname, firstname, cardnumber, address, city, zipcode, country
+my $sql = qq(SELECT borrowernumber, surname, firstname, cardnumber, address, city, zipcode, country
              FROM borrowers
              WHERE surname LIKE ?
              OR firstname LIKE ?
@@ -58,7 +58,8 @@ print "[";
 my $i = 0;
 while ( my $rec = $sth->fetchrow_hashref ) {
     if($i > 0){ print ","; }
-    print "{\"surname\":\"" . $rec->{surname} . "\",\"" .
+    print "{\"borrowernumber\":\"" . $rec->{borrowernumber} . "\",\"" .
+          "surname\":\"".$rec->{surname} . "\",\"" .
           "firstname\":\"".$rec->{firstname} . "\",\"" .
           "cardnumber\":\"".$rec->{cardnumber} . "\",\"" .
           "address\":\"".$rec->{address} . "\",\"" .
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 89c998a..19f3e49 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt
@@ -121,6 +121,21 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
 		$("*").ajaxError(function(evt, request, settings){
 			if ((alerted +=1) <= 1){ window.alert(_("AJAX error")+" (" + alerted + " alert)"); }
 		});
+        var reviewerField = $("#approver");
+        reviewerField.autocomplete({
+            source: "/cgi-bin/koha/circ/ysearch.pl",
+            minLength: 3,
+            select: function( event, ui ) {
+                reviewerField.val( ui.item.borrowernumber );
+                return false;
+            }
+        })
+        .data( "autocomplete" )._renderItem = function( ul, item ) {
+            return $( "<li></li>" )
+            .data( "item.autocomplete", item )
+            .append( "<a>" + item.surname + ", " + item.firstname + " (" + item.cardnumber + ") <small>" + item.address + " " + item.city + " " + item.zipcode + " " + item.country + "</small></a>" )
+            .appendTo( ul );
+        };
 	});
 //]]>
 </script>
-- 
1.7.9.5

From srdjan at catalyst.net.nz  Fri Aug 23 06:36:32 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Fri, 23 Aug 2013 16:36:32 +1200
Subject: [Koha-patches] [PATCH] Bug 9611: Change the password hashing
	algorithm from MD5 to Bcrypt
Message-ID: <1377232592-23400-1-git-send-email-srdjan@catalyst.net.nz>

From: Srikanth Dhondi <srikanth at catalyst.net.nz>

What this patch aims to accomplish?

 * All new passwords are stored as Bcrypt-hashes
 * For password verification:
     - If the user was created before this patch was applied then use
        MD5 to hash the entered password <-- backwards compatibility
     - If the user was created after this patch was applied then use
       Bcrypt to hash the entered password
 * Any password change made via the staff interface or the OPAC will
   be automatically Bcrypt-hashed; this applies to old users whose
   passwords were stored as MD5 hashes previously

Test plan:
  1) Add new users and check whether their passwords are stored as
     Bcrypt hashes or not.
  2) To test that authentication works for both old as well as new
     users:
       a) Login as an existing user whose password is stored as a
          MD5 hash
       b) Login as an existing user whose password is stored as a
          Bcrypt hash
  3) In the staff interface, change the password of an existing user
     whose password is stored as an MD5 hash
	a) Check the new password is stored as a Bcrypt-hash in the database
	b) Try to login with the new password
  4) In the OPAC, verify that
    a) Old user with old pass can change password, new format
    b) New user with new pass can change password
    c) Old and new user with self-updated pass can login

Whitespace cleanup was contributed by  Bernardo Gonzalez Kriegel.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
---
 C4/Auth.pm                 | 54 +++++++++++++++++++++++++++++++++++++++++-----
 C4/Members.pm              | 35 ++++++------------------------
 members/member-password.pl |  2 +-
 opac/opac-passwd.pl        | 13 ++++++++---
 4 files changed, 66 insertions(+), 38 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 1e17e59..d0b17fd 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -23,6 +23,8 @@ use Digest::MD5 qw(md5_base64);
 use JSON qw/encode_json decode_json/;
 use URI::Escape;
 use CGI::Session;
+use Crypt::Eksblowfish::Bcrypt qw(bcrypt en_base64);
+use Crypt::Random::Source;
 
 require Exporter;
 use C4::Context;
@@ -47,7 +49,7 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&checkauth &get_template_and_user &haspermission &get_user_subpermissions);
     @EXPORT_OK   = qw(&check_api_auth &get_session &check_cookie_auth &checkpw &get_all_subpermissions &get_user_subpermissions
-                      ParseSearchHistoryCookie
+                      ParseSearchHistoryCookie hash_password
                    );
     %EXPORT_TAGS = ( EditPermissions => [qw(get_all_subpermissions get_user_subpermissions)] );
     $ldap        = C4::Context->config('useldapserver') || 0;
@@ -1464,6 +1466,31 @@ sub get_session {
     return $session;
 }
 
+# Using Bcrypt method for hashing. This can be changed to something else in future, if needed.
+sub hash_password {
+    my $password = shift;
+
+    # Generate a salt if one is not passed
+    my $settings = shift;
+    unless( defined $settings ){ # if there are no settings, we need to create a salt and append settings
+    # Set the cost to 8 and append a NULL
+      $settings = '$2a$08$'.en_base64(generate_salt('strong'));
+    }
+    # Encrypt it
+    return bcrypt($password, $settings);
+}
+
+# Return a random salt
+sub generate_salt {
+    my ($type) = @_;
+
+        if ($type eq 'strong') {
+                return Crypt::Random::Source::get_strong(16);
+        } else {
+                return Crypt::Random::Source::get_weak(16);
+        }
+}
+
 sub checkpw {
 
     my ( $dbh, $userid, $password, $query ) = @_;
@@ -1489,10 +1516,18 @@ sub checkpw {
       );
     $sth->execute($userid);
     if ( $sth->rows ) {
-        my ( $md5password, $cardnumber, $borrowernumber, $userid, $firstname,
+        my ( $stored_hash, $cardnumber, $borrowernumber, $userid, $firstname,
             $surname, $branchcode, $flags )
           = $sth->fetchrow;
-        if ( md5_base64($password) eq $md5password and $md5password ne "!") {
+
+        # check what encryption algorithm was implemented: Bcrypt - if the hash starts with '$2' it is Bcrypt else md5
+        my $hash;
+        if ( substr($stored_hash,0,2) eq '$2') {
+            $hash = hash_password($password, $stored_hash);
+        } else {
+            $hash = md5_base64($password);
+        }
+        if ( $hash eq $stored_hash and $stored_hash ne "!") {
 
             C4::Context->set_userenv( "$borrowernumber", $userid, $cardnumber,
                 $firstname, $surname, $branchcode, $flags );
@@ -1505,10 +1540,19 @@ sub checkpw {
       );
     $sth->execute($userid);
     if ( $sth->rows ) {
-        my ( $md5password, $cardnumber, $borrowernumber, $userid, $firstname,
+        my ( $stored_hash, $cardnumber, $borrowernumber, $userid, $firstname,
             $surname, $branchcode, $flags )
           = $sth->fetchrow;
-        if ( md5_base64($password) eq $md5password ) {
+
+        # check what encryption algorithm was implemented: Bcrypt - if the hash starts with '$2' it is Bcrypt else md5
+        my $hash;
+        if ( substr($stored_hash,0,2) eq '$2') {
+            $hash = hash_password($password, $stored_hash);
+        } else {
+            $hash = md5_base64($password);
+        }
+
+        if ( $hash eq $stored_hash ) {
 
             C4::Context->set_userenv( $borrowernumber, $userid, $cardnumber,
                 $firstname, $surname, $branchcode, $flags );
diff --git a/C4/Members.pm b/C4/Members.pm
index 7ac69df..f58bb76 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -24,7 +24,6 @@ use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
 use C4::Dates qw(format_date_in_iso format_date);
-use Digest::MD5 qw(md5_base64);
 use String::Random qw( random_string );
 use Date::Calc qw/Today Add_Delta_YM check_date Date_to_Days/;
 use C4::Log; # logaction
@@ -40,6 +39,7 @@ use DateTime;
 use DateTime::Format::DateParse;
 use Koha::DateUtils;
 use Text::Unaccent qw( unac_string );
+use C4::Auth qw(hash_password);
 
 our ($VERSION, at ISA, at EXPORT, at EXPORT_OK,$debug);
 
@@ -250,7 +250,7 @@ sub Search {
                 $filter = [ $filter ];
                 push @$filter, {"borrowernumber"=>$matching_records};
             }
-		}
+        }
     }
 
     # $showallbranches was not used at the time SearchMember() was mainstreamed into Search().
@@ -283,7 +283,7 @@ sub Search {
     }
     $searchtype ||= "start_with";
 
-	return SearchInTable( "borrowers", $filter, $orderby, $limit, $columns_out, $search_on_fields, $searchtype );
+    return SearchInTable( "borrowers", $filter, $orderby, $limit, $columns_out, $search_on_fields, $searchtype );
 }
 
 =head2 GetMemberDetails
@@ -750,11 +750,11 @@ sub ModMember {
         if ($data{password} eq '****' or $data{password} eq '') {
             delete $data{password};
         } else {
-            $data{password} = md5_base64($data{password});
+            $data{password} = hash_password($data{password});
         }
     }
     my $old_categorycode = GetBorrowerCategorycode( $data{borrowernumber} );
-	my $execute_success=UpdateInTable("borrowers",\%data);
+    my $execute_success=UpdateInTable("borrowers",\%data);
     if ($execute_success) { # only proceed if the update was a success
         # ok if its an adult (type) it may have borrowers that depend on it as a guarantor
         # so when we update information for an adult we should check for guarantees and update the relevant part
@@ -805,10 +805,9 @@ sub AddMember {
     }
 
     # create a disabled account if no password provided
-    $data{'password'} = ($data{'password'})? md5_base64($data{'password'}) : '!';
+    $data{'password'} = ($data{'password'})? hash_password($data{'password'}) : '!';
     $data{'borrowernumber'}=InsertInTable("borrowers",\%data);
 
-
     # mysql_insertid is probably bad.  not necessarily accurate and mysql-specific at best.
     logaction("MEMBERS", "CREATE", $data{'borrowernumber'}, "") if C4::Context->preference("BorrowersLog");
 
@@ -1466,28 +1465,6 @@ sub GetExpiryDate {
     }
 }
 
-=head2 checkuserpassword (OUEST-PROVENCE)
-
-check for the password and login are not used
-return the number of record 
-0=> NOT USED 1=> USED
-
-=cut
-
-sub checkuserpassword {
-    my ( $borrowernumber, $userid, $password ) = @_;
-    $password = md5_base64($password);
-    my $dbh = C4::Context->dbh;
-    my $sth =
-      $dbh->prepare(
-"Select count(*) from borrowers where borrowernumber !=? and userid =? and password=? "
-      );
-    $sth->execute( $borrowernumber, $userid, $password );
-    my $number_rows = $sth->fetchrow;
-    return $number_rows;
-
-}
-
 =head2 GetborCatFromCatType
 
   ($codes_arrayref, $labels_hashref) = &GetborCatFromCatType();
diff --git a/members/member-password.pl b/members/member-password.pl
index bed8fc4..d2a9a31 100755
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -55,7 +55,7 @@ my $minpw = C4::Context->preference('minPasswordLength');
 push(@errors,'SHORTPASSWORD') if( $newpassword && $minpw && (length($newpassword) < $minpw ) );
 
 if ( $newpassword  && !scalar(@errors) ) {
-    my $digest=md5_base64($input->param('newpassword'));
+    my $digest=C4::Auth::hash_password($input->param('newpassword'));
     my $uid = $input->param('newuserid');
     my $dbh=C4::Context->dbh;
     if (changepassword($uid,$member,$digest)) {
diff --git a/opac/opac-passwd.pl b/opac/opac-passwd.pl
index 19425f7..923a5cf 100755
--- a/opac/opac-passwd.pl
+++ b/opac/opac-passwd.pl
@@ -29,6 +29,7 @@ use Digest::MD5 qw(md5_base64);
 use C4::Circulation;
 use C4::Members;
 use C4::Output;
+use C4::Auth qw(hash_password);
 
 my $query = new CGI;
 my $dbh   = C4::Context->dbh;
@@ -57,7 +58,7 @@ if ( C4::Context->preference("OpacPasswordChange") ) {
             if ( $query->param('Newkey') eq $query->param('Confirm')
                 && length( $query->param('Confirm') ) >= $minpasslen )
             {    # Record password
-                my $clave = md5_base64( $query->param('Newkey') );
+                my $clave = hash_password( $query->param('Newkey') );
                 $sth->execute( $clave, $borrowernumber );
                 $template->param( 'password_updated' => '1' );
                 $template->param( 'borrowernumber'   => $borrowernumber );
@@ -113,8 +114,14 @@ sub goodkey {
       $dbh->prepare("SELECT password FROM borrowers WHERE borrowernumber=?");
     $sth->execute($borrowernumber);
     if ( $sth->rows ) {
-        my ($md5password) = $sth->fetchrow;
-        if ( md5_base64($key) eq $md5password ) { return 1; }
+        my $hash;
+        my ($stored_hash) = $sth->fetchrow;
+        if ( substr($stored_hash,0,2) eq '$2') {
+            $hash = hash_password($key, $stored_hash);
+        } else {
+            $hash = md5_base64($key);
+        }
+        if ( $hash eq $stored_hash ) { return 1; }
         else { return 0; }
     }
     else { return 0; }
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Fri Aug 23 06:41:56 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Fri, 23 Aug 2013 16:41:56 +1200
Subject: [Koha-patches] [PATCH] bug 9611: removing external dependency for
	password salt generator
Message-ID: <1377232916-24422-1-git-send-email-srdjan@catalyst.net.nz>

From: Chris Hall <chrish at catalyst.net.nz>

To address packaging issues with Crypt::Random::Source, this patch
replaces the salt generation with a wrapper for /dev/urandom and
/dev/random.

The test plan for this patch is the same as that for the base patch
for bug 9611.

Signed-off-by: Galen Charlton <gmc at esilibrary.com>
---
 C4/Auth.pm | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 1e17e59..429181d 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -23,6 +23,8 @@ use Digest::MD5 qw(md5_base64);
 use JSON qw/encode_json decode_json/;
 use URI::Escape;
 use CGI::Session;
+use Crypt::Eksblowfish::Bcrypt qw(bcrypt en_base64);
+use Fcntl qw/O_RDONLY/; # O_RDONLY is used in generate_salt
 
 require Exporter;
 use C4::Context;
@@ -1464,6 +1466,91 @@ sub get_session {
     return $session;
 }
 
+# Using Bcrypt method for hashing. This can be changed to something else in future, if needed.
+sub hash_password {
+    my $password = shift;
+
+    # Generate a salt if one is not passed
+    my $settings = shift;
+    unless( defined $settings ){ # if there are no settings, we need to create a salt and append settings
+    # Set the cost to 8 and append a NULL
+      $settings = '$2a$08$'.en_base64(generate_salt('weak', 16));
+    }
+    # Encrypt it
+    return bcrypt($password, $settings);
+}
+
+=head2 generate_salt
+
+    use C4::Auth;
+    my $salt = C4::Auth::generate_salt($strength, $length);
+
+=item strength
+
+For general password salting a C<$strength> of C<weak> is recommend,
+For generating a server-salt a C<$strength> of C<strong> is recommended
+
+'strong' uses /dev/random which may block until sufficient entropy is acheived.
+'weak' uses /dev/urandom and is non-blocking.
+
+=back
+
+=item length
+
+C<$length> is a positive integer which specifies the desired length of the returned string
+
+=back
+
+=cut
+
+
+# the implementation of generate_salt is loosely based on Crypt::Random::Provider::File
+sub generate_salt {
+    # strength is 'strong' or 'weak'
+    # length is number of bytes to read, positive integer
+    my ($strength, $length) = @_;
+
+    my $source;
+
+    if( $length < 1 ){
+        die "non-positive strength of '$strength' passed to C4::Auth::generate_salt\n";
+    }
+
+    if( $strength eq "strong" ){
+        $source = '/dev/random'; # blocking
+    } else {
+        unless( $strength eq 'weak' ){
+            warn "unsuppored strength of '$strength' passed to C4::Auth::generate_salt, defaulting to 'weak'\n";
+        }
+        $source = '/dev/urandom'; # non-blocking
+    }
+
+    sysopen SOURCE, $source, O_RDONLY
+        or die "failed to open source '$source' in C4::Auth::generate_salt\n";
+
+    # $bytes is the bytes just read
+    # $string is the concatenation of all the bytes read so far
+    my( $bytes, $string ) = ("", "");
+
+    # keep reading until we have $length bytes in $strength
+    while( length($string) < $length ){
+        # return the number of bytes read, 0 (EOF), or -1 (ERROR)
+        my $return = sysread SOURCE, $bytes, $length - length($string);
+
+        # if no bytes were read, keep reading (if using /dev/random it is possible there was insufficient entropy so this may block)
+        next unless $return;
+        if( $return == -1 ){
+            die "error while reading from $source in C4::Auth::generate_salt\n";
+        }
+
+        $string .= $bytes;
+    }
+
+    close SOURCE;
+    return $string;
+}
+
+
 sub checkpw {
 
     my ( $dbh, $userid, $password, $query ) = @_;
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Fri Aug 23 06:56:44 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Fri, 23 Aug 2013 16:56:44 +1200
Subject: [Koha-patches] [PATCH] Bug 9611: Change the password hashing
	algorithm from MD5 to Bcrypt
Message-ID: <1377233804-27075-1-git-send-email-srdjan@catalyst.net.nz>

From: Srikanth Dhondi <srikanth at catalyst.net.nz>

What this patch aims to accomplish?

 * All new passwords are stored as Bcrypt-hashes
 * For password verification:
     - If the user was created before this patch was applied then use
        MD5 to hash the entered password <-- backwards compatibility
     - If the user was created after this patch was applied then use
       Bcrypt to hash the entered password
 * Any password change made via the staff interface or the OPAC will
   be automatically Bcrypt-hashed; this applies to old users whose
   passwords were stored as MD5 hashes previously

Test plan:
  1) Add new users and check whether their passwords are stored as
     Bcrypt hashes or not.
  2) To test that authentication works for both old as well as new
     users:
       a) Login as an existing user whose password is stored as a
          MD5 hash
       b) Login as an existing user whose password is stored as a
          Bcrypt hash
  3) In the staff interface, change the password of an existing user
     whose password is stored as an MD5 hash
	a) Check the new password is stored as a Bcrypt-hash in the database
	b) Try to login with the new password
  4) In the OPAC, verify that
    a) Old user with old pass can change password, new format
    b) New user with new pass can change password
    c) Old and new user with self-updated pass can login

Whitespace cleanup was contributed by  Bernardo Gonzalez Kriegel.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Mason James <mtj at kohaaloha.com>
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
---
 C4/Auth.pm                 | 114 +++++++++++++++++++++++++++++++++++++++++++--
 C4/Members.pm              |  35 +++-----------
 members/member-password.pl |   2 +-
 opac/opac-passwd.pl        |  13 ++++--
 4 files changed, 126 insertions(+), 38 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 1e17e59..7674691 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -23,6 +23,8 @@ use Digest::MD5 qw(md5_base64);
 use JSON qw/encode_json decode_json/;
 use URI::Escape;
 use CGI::Session;
+use Crypt::Eksblowfish::Bcrypt qw(bcrypt en_base64);
+use Fcntl qw/O_RDONLY/; # O_RDONLY is used in generate_salt
 
 require Exporter;
 use C4::Context;
@@ -47,7 +49,7 @@ BEGIN {
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&checkauth &get_template_and_user &haspermission &get_user_subpermissions);
     @EXPORT_OK   = qw(&check_api_auth &get_session &check_cookie_auth &checkpw &get_all_subpermissions &get_user_subpermissions
-                      ParseSearchHistoryCookie
+                      ParseSearchHistoryCookie hash_password
                    );
     %EXPORT_TAGS = ( EditPermissions => [qw(get_all_subpermissions get_user_subpermissions)] );
     $ldap        = C4::Context->config('useldapserver') || 0;
@@ -1464,6 +1466,91 @@ sub get_session {
     return $session;
 }
 
+# Using Bcrypt method for hashing. This can be changed to something else in future, if needed.
+sub hash_password {
+    my $password = shift;
+
+    # Generate a salt if one is not passed
+    my $settings = shift;
+    unless( defined $settings ){ # if there are no settings, we need to create a salt and append settings
+    # Set the cost to 8 and append a NULL
+        $settings = '$2a$08$'.en_base64(generate_salt('weak', 16));
+    }
+    # Encrypt it
+    return bcrypt($password, $settings);
+}
+
+=head2 generate_salt
+
+    use C4::Auth;
+    my $salt = C4::Auth::generate_salt($strength, $length);
+
+=item strength
+
+For general password salting a C<$strength> of C<weak> is recommend,
+For generating a server-salt a C<$strength> of C<strong> is recommended
+
+'strong' uses /dev/random which may block until sufficient entropy is acheived.
+'weak' uses /dev/urandom and is non-blocking.
+
+=back
+
+=item length
+
+C<$length> is a positive integer which specifies the desired length of the returned string
+
+=back
+
+=cut
+
+
+# the implementation of generate_salt is loosely based on Crypt::Random::Provider::File
+sub generate_salt {
+    # strength is 'strong' or 'weak'
+    # length is number of bytes to read, positive integer
+    my ($strength, $length) = @_;
+
+    my $source;
+
+    if( $length < 1 ){
+        die "non-positive strength of '$strength' passed to C4::Auth::generate_salt\n";
+    }
+
+    if( $strength eq "strong" ){
+        $source = '/dev/random'; # blocking
+    } else {
+        unless( $strength eq 'weak' ){
+            warn "unsuppored strength of '$strength' passed to C4::Auth::generate_salt, defaulting to 'weak'\n";
+        }
+        $source = '/dev/urandom'; # non-blocking
+    }
+
+    sysopen SOURCE, $source, O_RDONLY
+        or die "failed to open source '$source' in C4::Auth::generate_salt\n";
+
+    # $bytes is the bytes just read
+    # $string is the concatenation of all the bytes read so far
+    my( $bytes, $string ) = ("", "");
+
+    # keep reading until we have $length bytes in $strength
+    while( length($string) < $length ){
+        # return the number of bytes read, 0 (EOF), or -1 (ERROR)
+        my $return = sysread SOURCE, $bytes, $length - length($string);
+
+        # if no bytes were read, keep reading (if using /dev/random it is possible there was insufficient entropy so this may block)
+        next unless $return;
+        if( $return == -1 ){
+            die "error while reading from $source in C4::Auth::generate_salt\n";
+        }
+
+        $string .= $bytes;
+    }
+
+    close SOURCE;
+    return $string;
+}
+
+
 sub checkpw {
 
     my ( $dbh, $userid, $password, $query ) = @_;
@@ -1489,10 +1576,18 @@ sub checkpw {
       );
     $sth->execute($userid);
     if ( $sth->rows ) {
-        my ( $md5password, $cardnumber, $borrowernumber, $userid, $firstname,
+        my ( $stored_hash, $cardnumber, $borrowernumber, $userid, $firstname,
             $surname, $branchcode, $flags )
           = $sth->fetchrow;
-        if ( md5_base64($password) eq $md5password and $md5password ne "!") {
+
+        # check what encryption algorithm was implemented: Bcrypt - if the hash starts with '$2' it is Bcrypt else md5
+        my $hash;
+        if ( substr($stored_hash,0,2) eq '$2') {
+            $hash = hash_password($password, $stored_hash);
+        } else {
+            $hash = md5_base64($password);
+        }
+        if ( $hash eq $stored_hash and $stored_hash ne "!") {
 
             C4::Context->set_userenv( "$borrowernumber", $userid, $cardnumber,
                 $firstname, $surname, $branchcode, $flags );
@@ -1505,10 +1600,19 @@ sub checkpw {
       );
     $sth->execute($userid);
     if ( $sth->rows ) {
-        my ( $md5password, $cardnumber, $borrowernumber, $userid, $firstname,
+        my ( $stored_hash, $cardnumber, $borrowernumber, $userid, $firstname,
             $surname, $branchcode, $flags )
           = $sth->fetchrow;
-        if ( md5_base64($password) eq $md5password ) {
+
+        # check what encryption algorithm was implemented: Bcrypt - if the hash starts with '$2' it is Bcrypt else md5
+        my $hash;
+        if ( substr($stored_hash,0,2) eq '$2') {
+            $hash = hash_password($password, $stored_hash);
+        } else {
+            $hash = md5_base64($password);
+        }
+
+        if ( $hash eq $stored_hash ) {
 
             C4::Context->set_userenv( $borrowernumber, $userid, $cardnumber,
                 $firstname, $surname, $branchcode, $flags );
diff --git a/C4/Members.pm b/C4/Members.pm
index 7ac69df..f58bb76 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -24,7 +24,6 @@ use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Context;
 use C4::Dates qw(format_date_in_iso format_date);
-use Digest::MD5 qw(md5_base64);
 use String::Random qw( random_string );
 use Date::Calc qw/Today Add_Delta_YM check_date Date_to_Days/;
 use C4::Log; # logaction
@@ -40,6 +39,7 @@ use DateTime;
 use DateTime::Format::DateParse;
 use Koha::DateUtils;
 use Text::Unaccent qw( unac_string );
+use C4::Auth qw(hash_password);
 
 our ($VERSION, at ISA, at EXPORT, at EXPORT_OK,$debug);
 
@@ -250,7 +250,7 @@ sub Search {
                 $filter = [ $filter ];
                 push @$filter, {"borrowernumber"=>$matching_records};
             }
-		}
+        }
     }
 
     # $showallbranches was not used at the time SearchMember() was mainstreamed into Search().
@@ -283,7 +283,7 @@ sub Search {
     }
     $searchtype ||= "start_with";
 
-	return SearchInTable( "borrowers", $filter, $orderby, $limit, $columns_out, $search_on_fields, $searchtype );
+    return SearchInTable( "borrowers", $filter, $orderby, $limit, $columns_out, $search_on_fields, $searchtype );
 }
 
 =head2 GetMemberDetails
@@ -750,11 +750,11 @@ sub ModMember {
         if ($data{password} eq '****' or $data{password} eq '') {
             delete $data{password};
         } else {
-            $data{password} = md5_base64($data{password});
+            $data{password} = hash_password($data{password});
         }
     }
     my $old_categorycode = GetBorrowerCategorycode( $data{borrowernumber} );
-	my $execute_success=UpdateInTable("borrowers",\%data);
+    my $execute_success=UpdateInTable("borrowers",\%data);
     if ($execute_success) { # only proceed if the update was a success
         # ok if its an adult (type) it may have borrowers that depend on it as a guarantor
         # so when we update information for an adult we should check for guarantees and update the relevant part
@@ -805,10 +805,9 @@ sub AddMember {
     }
 
     # create a disabled account if no password provided
-    $data{'password'} = ($data{'password'})? md5_base64($data{'password'}) : '!';
+    $data{'password'} = ($data{'password'})? hash_password($data{'password'}) : '!';
     $data{'borrowernumber'}=InsertInTable("borrowers",\%data);
 
-
     # mysql_insertid is probably bad.  not necessarily accurate and mysql-specific at best.
     logaction("MEMBERS", "CREATE", $data{'borrowernumber'}, "") if C4::Context->preference("BorrowersLog");
 
@@ -1466,28 +1465,6 @@ sub GetExpiryDate {
     }
 }
 
-=head2 checkuserpassword (OUEST-PROVENCE)
-
-check for the password and login are not used
-return the number of record 
-0=> NOT USED 1=> USED
-
-=cut
-
-sub checkuserpassword {
-    my ( $borrowernumber, $userid, $password ) = @_;
-    $password = md5_base64($password);
-    my $dbh = C4::Context->dbh;
-    my $sth =
-      $dbh->prepare(
-"Select count(*) from borrowers where borrowernumber !=? and userid =? and password=? "
-      );
-    $sth->execute( $borrowernumber, $userid, $password );
-    my $number_rows = $sth->fetchrow;
-    return $number_rows;
-
-}
-
 =head2 GetborCatFromCatType
 
   ($codes_arrayref, $labels_hashref) = &GetborCatFromCatType();
diff --git a/members/member-password.pl b/members/member-password.pl
index bed8fc4..d2a9a31 100755
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -55,7 +55,7 @@ my $minpw = C4::Context->preference('minPasswordLength');
 push(@errors,'SHORTPASSWORD') if( $newpassword && $minpw && (length($newpassword) < $minpw ) );
 
 if ( $newpassword  && !scalar(@errors) ) {
-    my $digest=md5_base64($input->param('newpassword'));
+    my $digest=C4::Auth::hash_password($input->param('newpassword'));
     my $uid = $input->param('newuserid');
     my $dbh=C4::Context->dbh;
     if (changepassword($uid,$member,$digest)) {
diff --git a/opac/opac-passwd.pl b/opac/opac-passwd.pl
index 19425f7..923a5cf 100755
--- a/opac/opac-passwd.pl
+++ b/opac/opac-passwd.pl
@@ -29,6 +29,7 @@ use Digest::MD5 qw(md5_base64);
 use C4::Circulation;
 use C4::Members;
 use C4::Output;
+use C4::Auth qw(hash_password);
 
 my $query = new CGI;
 my $dbh   = C4::Context->dbh;
@@ -57,7 +58,7 @@ if ( C4::Context->preference("OpacPasswordChange") ) {
             if ( $query->param('Newkey') eq $query->param('Confirm')
                 && length( $query->param('Confirm') ) >= $minpasslen )
             {    # Record password
-                my $clave = md5_base64( $query->param('Newkey') );
+                my $clave = hash_password( $query->param('Newkey') );
                 $sth->execute( $clave, $borrowernumber );
                 $template->param( 'password_updated' => '1' );
                 $template->param( 'borrowernumber'   => $borrowernumber );
@@ -113,8 +114,14 @@ sub goodkey {
       $dbh->prepare("SELECT password FROM borrowers WHERE borrowernumber=?");
     $sth->execute($borrowernumber);
     if ( $sth->rows ) {
-        my ($md5password) = $sth->fetchrow;
-        if ( md5_base64($key) eq $md5password ) { return 1; }
+        my $hash;
+        my ($stored_hash) = $sth->fetchrow;
+        if ( substr($stored_hash,0,2) eq '$2') {
+            $hash = hash_password($key, $stored_hash);
+        } else {
+            $hash = md5_base64($key);
+        }
+        if ( $hash eq $stored_hash ) { return 1; }
         else { return 0; }
     }
     else { return 0; }
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Mon Aug 26 02:23:16 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon, 26 Aug 2013 12:23:16 +1200
Subject: [Koha-patches] [PATCH] bug_10781: Removed ILSDI::Utility
Message-ID: <1377476596-24937-1-git-send-email-srdjan@catalyst.net.nz>

Test:
This should be a noop. Regression testing required:
/cgi-bin/koha/ilsdi.pl functioanality, in particuler:
GetAvailability - ?service=Describe&verb=GetAvailability
AuthenticatePatron - ?service=Describe&verb=AuthenticatePatron

ILS-DI syspref must be turned on
---
 C4/ILSDI/Services.pm |  40 ++++++++++++++++++-
 C4/ILSDI/Utility.pm  | 107 ---------------------------------------------------
 t/ILSDI_Utility.t    |  14 -------
 3 files changed, 38 insertions(+), 123 deletions(-)
 delete mode 100644 C4/ILSDI/Utility.pm
 delete mode 100755 t/ILSDI_Utility.t

diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm
index dd43743..2eec0ac 100644
--- a/C4/ILSDI/Services.pm
+++ b/C4/ILSDI/Services.pm
@@ -29,11 +29,11 @@ use C4::Biblio;
 use C4::Reserves qw(AddReserve CancelReserve GetReservesFromBiblionumber GetReservesFromBorrowernumber CanBookBeReserved CanItemBeReserved);
 use C4::Context;
 use C4::AuthoritiesMarc;
-use C4::ILSDI::Utility;
 use XML::Simple;
 use HTML::Entities;
 use CGI;
 use DateTime;
+use Data::Dumper;
 
 =head1 NAME
 
@@ -114,7 +114,7 @@ sub GetAvailability {
 
     foreach my $id ( split( / /, $cgi->param('id') ) ) {
         if ( $cgi->param('id_type') eq "item" ) {
-            my ( $biblionumber, $status, $msg, $location ) = Availability($id);
+            my ( $biblionumber, $status, $msg, $location ) = _availability($id);
 
             $out .= "  <dlf:record>\n";
             $out .= "    <dlf:bibliographic id=\"" . ( $biblionumber || $id ) . "\" />\n";
@@ -767,4 +767,40 @@ sub CancelHold {
     return { code => 'Canceled' };
 }
 
+=head2 _availability
+
+Returns, for an itemnumber, an array containing availability information.
+
+	my ($biblionumber, $status, $msg, $location) = _availability($id);
+
+=cut
+
+sub _availability {
+    my ($itemnumber) = @_;
+    my $item = GetItem( $itemnumber, undef, undef );
+
+    if ( not $item->{'itemnumber'} ) {
+        return ( undef, 'unknown', 'Error: could not retrieve availability for this ID', undef );
+    }
+
+    my $biblionumber = $item->{'biblioitemnumber'};
+    my $location     = GetBranchName( $item->{'holdingbranch'} );
+
+    if ( $item->{'notforloan'} ) {
+        return ( $biblionumber, 'not available', 'Not for loan', $location );
+    } elsif ( $item->{'onloan'} ) {
+        return ( $biblionumber, 'not available', 'Checked out', $location );
+    } elsif ( $item->{'itemlost'} ) {
+        return ( $biblionumber, 'not available', 'Item lost', $location );
+    } elsif ( $item->{'wthdrawn'} ) {
+        return ( $biblionumber, 'not available', 'Item withdrawn', $location );
+    } elsif ( $item->{'damaged'} ) {
+        return ( $biblionumber, 'not available', 'Item damaged', $location );
+    } else {
+        return ( $biblionumber, 'available', undef, $location );
+    }
+
+    die Data::Dumper::Dumper($item);
+}
+
 1;
diff --git a/C4/ILSDI/Utility.pm b/C4/ILSDI/Utility.pm
deleted file mode 100644
index b8c1457..0000000
--- a/C4/ILSDI/Utility.pm
+++ /dev/null
@@ -1,107 +0,0 @@
-package C4::ILSDI::Utility;
-
-# Copyright 2009 SARL Biblibre
-# Copyright 2011 software.coop and MJ Ray
-#
-# This file is part of Koha.
-#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-use strict;
-use warnings;
-
-use C4::Members;
-use C4::Items;
-use C4::Circulation;
-use C4::Biblio;
-use C4::Reserves qw(GetReservesFromBorrowernumber CanBookBeReserved);
-use C4::Context;
-use C4::Branch qw/GetBranchName/;
-use Digest::MD5 qw(md5_base64);
-
-use vars qw($VERSION @ISA @EXPORT);
-
-BEGIN {
-
-    # set the version for version checking
-    $VERSION = 3.07.00.049;
-    require Exporter;
-    @ISA    = qw(Exporter);
-    @EXPORT = qw(
-      &BorrowerExists &Availability
-    );
-}
-
-=head1 NAME
-
-C4::ILS-DI::Utility - ILS-DI Utilities
-
-=cut
-
-=head2 BorrowerExists
-
-Checks, for a given userid and password, if the borrower exists.
-
-	if ( BorrowerExists($userid, $password) ) {
-		# Do stuff
-	}
-
-=cut
-
-sub BorrowerExists {
-    my ( $userid, $password ) = @_;
-    $password = md5_base64($password);
-    my $dbh = C4::Context->dbh;
-    my $sth = $dbh->prepare("SELECT COUNT(*) FROM borrowers WHERE userid =? and password=? ");
-    $sth->execute( $userid, $password );
-    return $sth->fetchrow;
-}
-
-=head2 Availability
-
-Returns, for an itemnumber, an array containing availability information.
-
-	my ($biblionumber, $status, $msg, $location) = Availability($id);
-
-=cut
-
-sub Availability {
-    my ($itemnumber) = @_;
-    my $item = GetItem( $itemnumber, undef, undef );
-
-    if ( not $item->{'itemnumber'} ) {
-        return ( undef, 'unknown', 'Error: could not retrieve availability for this ID', undef );
-    }
-
-    my $biblionumber = $item->{'biblioitemnumber'};
-    my $location     = GetBranchName( $item->{'holdingbranch'} );
-
-    if ( $item->{'notforloan'} ) {
-        return ( $biblionumber, 'not available', 'Not for loan', $location );
-    } elsif ( $item->{'onloan'} ) {
-        return ( $biblionumber, 'not available', 'Checked out', $location );
-    } elsif ( $item->{'itemlost'} ) {
-        return ( $biblionumber, 'not available', 'Item lost', $location );
-    } elsif ( $item->{'wthdrawn'} ) {
-        return ( $biblionumber, 'not available', 'Item withdrawn', $location );
-    } elsif ( $item->{'damaged'} ) {
-        return ( $biblionumber, 'not available', 'Item damaged', $location );
-    } else {
-        return ( $biblionumber, 'available', undef, $location );
-    }
-
-    die Data::Dumper::Dumper($item);
-}
-
-1;
diff --git a/t/ILSDI_Utility.t b/t/ILSDI_Utility.t
deleted file mode 100755
index c06209b..0000000
--- a/t/ILSDI_Utility.t
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/perl
-#
-# This Koha test module is a stub!  
-# Add more tests here!!!
-
-use strict;
-use warnings;
-
-use Test::More tests => 1;
-
-BEGIN {
-        use_ok('C4::ILSDI::Utility');
-}
-
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Mon Aug 26 08:48:23 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon, 26 Aug 2013 18:48:23 +1200
Subject: [Koha-patches] [PATCH] bug_9611: Extracted checkpw_internal() and
	checkpw_hash() from checkpw()
Message-ID: <1377499703-4846-1-git-send-email-srdjan@catalyst.net.nz>

---
 C4/Auth.pm | 50 ++++++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 7674691..829f26a 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -48,7 +48,8 @@ BEGIN {
     $debug       = $ENV{DEBUG};
     @ISA         = qw(Exporter);
     @EXPORT      = qw(&checkauth &get_template_and_user &haspermission &get_user_subpermissions);
-    @EXPORT_OK   = qw(&check_api_auth &get_session &check_cookie_auth &checkpw &get_all_subpermissions &get_user_subpermissions
+    @EXPORT_OK   = qw(&check_api_auth &get_session &check_cookie_auth &checkpw &checkpw_internal &checkpw_hash
+                      &get_all_subpermissions &get_user_subpermissions
                       ParseSearchHistoryCookie hash_password
                    );
     %EXPORT_TAGS = ( EditPermissions => [qw(get_all_subpermissions get_user_subpermissions)] );
@@ -1552,8 +1553,8 @@ sub generate_salt {
 
 
 sub checkpw {
-
     my ( $dbh, $userid, $password, $query ) = @_;
+
     if ($ldap) {
         $debug and print STDERR "## checkpw - checking LDAP\n";
         my ($retval,$retcard,$retuserid) = checkpw_ldap(@_);    # EXTERNAL AUTH
@@ -1563,13 +1564,18 @@ sub checkpw {
     if ($cas && $query && $query->param('ticket')) {
         $debug and print STDERR "## checkpw - checking CAS\n";
     # In case of a CAS authentication, we use the ticket instead of the password
-    my $ticket = $query->param('ticket');
+        my $ticket = $query->param('ticket');
         my ($retval,$retcard,$retuserid) = checkpw_cas($dbh, $ticket, $query);    # EXTERNAL AUTH
         ($retval) and return ($retval,$retcard,$retuserid);
-    return 0;
+        return 0;
     }
 
-    # INTERNAL AUTH
+    return checkpw_internal(@_)
+}
+
+sub checkpw_internal {
+    my ( $dbh, $userid, $password ) = @_;
+
     my $sth =
       $dbh->prepare(
 "select password,cardnumber,borrowernumber,userid,firstname,surname,branchcode,flags from borrowers where userid=?"
@@ -1580,14 +1586,7 @@ sub checkpw {
             $surname, $branchcode, $flags )
           = $sth->fetchrow;
 
-        # check what encryption algorithm was implemented: Bcrypt - if the hash starts with '$2' it is Bcrypt else md5
-        my $hash;
-        if ( substr($stored_hash,0,2) eq '$2') {
-            $hash = hash_password($password, $stored_hash);
-        } else {
-            $hash = md5_base64($password);
-        }
-        if ( $hash eq $stored_hash and $stored_hash ne "!") {
+        if ( checkpw_hash($password, $stored_hash) ) {
 
             C4::Context->set_userenv( "$borrowernumber", $userid, $cardnumber,
                 $firstname, $surname, $branchcode, $flags );
@@ -1604,15 +1603,7 @@ sub checkpw {
             $surname, $branchcode, $flags )
           = $sth->fetchrow;
 
-        # check what encryption algorithm was implemented: Bcrypt - if the hash starts with '$2' it is Bcrypt else md5
-        my $hash;
-        if ( substr($stored_hash,0,2) eq '$2') {
-            $hash = hash_password($password, $stored_hash);
-        } else {
-            $hash = md5_base64($password);
-        }
-
-        if ( $hash eq $stored_hash ) {
+        if ( checkpw_hash($password, $stored_hash) ) {
 
             C4::Context->set_userenv( $borrowernumber, $userid, $cardnumber,
                 $firstname, $surname, $branchcode, $flags );
@@ -1639,6 +1630,21 @@ sub checkpw {
     return 0;
 }
 
+sub checkpw_hash {
+    my ( $password, $stored_hash ) = @_;
+
+    return if $stored_hash eq '!';
+
+    # check what encryption algorithm was implemented: Bcrypt - if the hash starts with '$2' it is Bcrypt else md5
+    my $hash;
+    if ( substr($stored_hash,0,2) eq '$2') {
+        $hash = hash_password($password, $stored_hash);
+    } else {
+        $hash = md5_base64($password);
+    }
+    return $hash eq $stored_hash;
+}
+
 =head2 getuserflags
 
     my $authflags = getuserflags($flags, $userid, [$dbh]);
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Mon Aug 26 08:48:34 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon, 26 Aug 2013 18:48:34 +1200
Subject: [Koha-patches] [PATCH] bug_9611: removed md5_base64 from imports -
	not used
Message-ID: <1377499714-4909-1-git-send-email-srdjan@catalyst.net.nz>

---
 C4/ImportExportFramework.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/C4/ImportExportFramework.pm b/C4/ImportExportFramework.pm
index 72873f2..f85101d 100644
--- a/C4/ImportExportFramework.pm
+++ b/C4/ImportExportFramework.pm
@@ -21,7 +21,7 @@ use strict;
 use warnings;
 use XML::LibXML;
 use XML::LibXML::XPathContext;
-use Digest::MD5 qw(md5_base64);
+use Digest::MD5 qw();
 use POSIX qw(strftime);
 
 use C4::Context;
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Mon Aug 26 08:48:46 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon, 26 Aug 2013 18:48:46 +1200
Subject: [Koha-patches] [PATCH] bug_9611: use checkpw_hash() instead of md5
	hash
Message-ID: <1377499726-4976-1-git-send-email-srdjan@catalyst.net.nz>

Test:

* SIP: Have an old user and create a new user
- use either tenet sip test or
  C4/SIP/interactive_patron_check_password.pl to check old
  userid/password
- do the same for the new user
---
 C4/SIP/ILS/Patron.pm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/C4/SIP/ILS/Patron.pm b/C4/SIP/ILS/Patron.pm
index ac24d2f..1a52944 100644
--- a/C4/SIP/ILS/Patron.pm
+++ b/C4/SIP/ILS/Patron.pm
@@ -21,7 +21,7 @@ use C4::Koha;
 use C4::Members;
 use C4::Reserves;
 use C4::Branch qw(GetBranchName);
-use Digest::MD5 qw(md5_base64);
+use C4::Auth qw(checkpw_hash);
 
 our $VERSION = 3.07.00.049;
 
@@ -39,7 +39,7 @@ sub new {
     }
     $kp = GetMemberDetails($kp->{borrowernumber});
     $debug and warn "new Patron (GetMemberDetails): " . Dumper($kp);
-    my $pw        = $kp->{password};  ### FIXME - md5hash -- deal with .
+    my $pw        = $kp->{password};
     my $flags     = $kp->{flags};     # or warn "Warning: No flags from patron object for '$patron_id'";
     my $debarred  = defined($kp->{flags}->{DBARRED});
     $debug and warn sprintf("Debarred = %s : ", ($debarred||'undef')) . Dumper(%{$kp->{flags}});
@@ -189,11 +189,13 @@ sub AUTOLOAD {
 
 sub check_password {
     my ($self, $pwd) = @_;
-    my $md5pwd = $self->{password};
+    defined $pwd or return 0;                  # you gotta give me something (at least ''), or no deal
+
+    my $hashed_pwd = $self->{password};
+    defined $hashed_pwd or return $pwd eq '';  # if the record has a NULL password, accept '' as match
+
     # warn sprintf "check_password for %s: '%s' vs. '%s'",($self->{name}||''),($self->{password}||''),($pwd||'');
-    (defined $pwd   ) or return 0;        # you gotta give me something (at least ''), or no deal
-    (defined $md5pwd) or return($pwd eq '');    # if the record has a NULL password, accept '' as match
-    return (md5_base64($pwd) eq $md5pwd);
+    return checkpw_hash($pwd, $hashed_pwd);
 }
 
 # A few special cases, not in AUTOLOADed %fields
-- 
1.8.1.2

From srdjan at catalyst.net.nz  Mon Aug 26 08:50:48 2013
From: srdjan at catalyst.net.nz (Srdjan)
Date: Mon, 26 Aug 2013 18:50:48 +1200
Subject: [Koha-patches] [PATCH] bug_9611: use hash_password() and checkpw_*
	instead of md5 hash
Message-ID: <1377499848-5253-1-git-send-email-srdjan@catalyst.net.nz>

Test:

* LDAP:
- Turn on LDAP auth in koha-config.xml. Sset "update" in your server config to 1
- Change user's password on LDAP
- Login to Koha using LDAP - Koha password should be updated, to check
- Turn off LDAP auth in koha-config.xml
- You should be ble to log in with the new password

I do not have a LDAP facility, so I cheated. I ran
perl -e 'use C4::Auth_with_ldap; C4::Auth_with_ldap::_do_changepassword("srdjan", 1000022259, "srdjan");'
and was able to change the password.
---
 C4/Auth_with_ldap.pm | 64 ++++++++++++++++++++++++++--------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm
index 6143c9f..49ffc70 100644
--- a/C4/Auth_with_ldap.pm
+++ b/C4/Auth_with_ldap.pm
@@ -19,7 +19,7 @@ package C4::Auth_with_ldap;
 
 use strict;
 #use warnings; FIXME - Bug 2505
-use Digest::MD5 qw(md5_base64);
+use Carp;
 
 use C4::Debug;
 use C4::Context;
@@ -27,6 +27,7 @@ use C4::Members qw(AddMember changepassword);
 use C4::Members::Attributes;
 use C4::Members::AttributeTypes;
 use C4::Utils qw( :all );
+use C4::Auth qw(hash_password checkpw_internal);
 use List::MoreUtils qw( any );
 use Net::LDAP;
 use Net::LDAP::Filter;
@@ -264,44 +265,43 @@ sub exists_local {
 }
 
 sub _do_changepassword {
-    my ($userid, $borrowerid, $digest) = @_;
+    my ($userid, $borrowerid, $password) = @_;
+
+    my $digest = hash_password($password);
+
     $debug and print STDERR "changing local password for borrowernumber=$borrowerid to '$digest'\n";
     changepassword($userid, $borrowerid, $digest);
 
-	# Confirm changes
-	my $sth = C4::Context->dbh->prepare("SELECT password,cardnumber FROM borrowers WHERE borrowernumber=? ");
-	$sth->execute($borrowerid);
-	if ($sth->rows) {
-		my ($md5password, $cardnum) = $sth->fetchrow;
-        ($digest eq $md5password) and return $cardnum;
-		warn "Password mismatch after update to cardnumber=$cardnum (borrowernumber=$borrowerid)";
-		return;
-	}
-	die "Unexpected error after password update to userid/borrowernumber: $userid / $borrowerid.";
+    my ($ok, $cardnum) = checkpw_internal(C4::Context->dbh, $userid, $password);
+    return $cardnum if $ok;
+
+    warn "Password mismatch after update to borrowernumber=$borrowerid";
+    return;
 }
 
 sub update_local {
-	my   $userid   = shift             or return;
-	my   $digest   = md5_base64(shift) or return;
-	my $borrowerid = shift             or return;
-	my $borrower   = shift             or return;
-	my @keys = keys %$borrower;
-	my $dbh = C4::Context->dbh;
-	my $query = "UPDATE  borrowers\nSET     " . 
-		join(',', map {"$_=?"} @keys) .
-		"\nWHERE   borrowernumber=? "; 
-	my $sth = $dbh->prepare($query);
-	if ($debug) {
-		print STDERR $query, "\n",
-			join "\n", map {"$_ = '" . $borrower->{$_} . "'"} @keys;
-		print STDERR "\nuserid = $userid\n";
-	}
-	$sth->execute(
-		((map {$borrower->{$_}} @keys), $borrowerid)
-	);
+    my $userid     = shift or croak "No userid";
+    my $password   = shift or croak "No password";
+    my $borrowerid = shift or croak "No borrowerid";
+    my $borrower   = shift or croak "No borrower record";
+
+    my @keys = keys %$borrower;
+    my $dbh = C4::Context->dbh;
+    my $query = "UPDATE  borrowers\nSET     " . 
+        join(',', map {"$_=?"} @keys) .
+        "\nWHERE   borrowernumber=? "; 
+    my $sth = $dbh->prepare($query);
+    if ($debug) {
+        print STDERR $query, "\n",
+            join "\n", map {"$_ = '" . $borrower->{$_} . "'"} @keys;
+        print STDERR "\nuserid = $userid\n";
+    }
+    $sth->execute(
+        ((map {$borrower->{$_}} @keys), $borrowerid)
+    );
 
-	# MODIFY PASSWORD/LOGIN
-	_do_changepassword($userid, $borrowerid, $digest);
+    # MODIFY PASSWORD/LOGIN
+    _do_changepassword($userid, $borrowerid, $password);
 }
 
 1;
-- 
1.8.1.2

From tomascohen at gmail.com  Thu Aug 29 20:09:52 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Thu, 29 Aug 2013 15:09:52 -0300
Subject: [Koha-patches] [PATCH] Bug 10802: Packages should install
	history.txt
Message-ID: <1377799792-4659-1-git-send-email-tomascohen@gmail.com>

While bug 8911 fixed a problem regarding history.txt, a proper fix for packages was missing.
This patch does three things:
 - Adds docs/history.txt to debian/koha-common.docs so it gets installed.
 - Moves the line installing the release notes from debian/koha-common.install to debian/koha-common.docs.
 - Adds an override_dh_compress entry in debian/rules that excludes history.txt from the dh_compress routine [1]

To test:
 - Take a picture of how /usr/share/doc/koha-common looks.
 - Apply the patch and build a package [2].
 - Upgrade and/or install using your package.
 - Look for the contents of the /usr/share/doc/koha-common, it should look the same, but history.txt must be there.
 - More > About Koha > Koha Timeline should show the history lines.

Regards
To+

[1] As 'man dh_compress' says, it is needed as every file considered for the doc dir that is plain text and is more than 4k size will be gzipped unless stated otherwise. We need it uncompressed for about.pl.
[2] I did it for you, it can be grabbed here:  http://ubuntu.unc.edu.ar/koha/koha-common_3.13-1~git+20130829144510.18a6876b_all.deb

Sponsored-by: Universidad Nacional de Cordoba
---
 debian/koha-common.docs    |    2 ++
 debian/koha-common.install |    1 -
 debian/rules               |    4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/koha-common.docs b/debian/koha-common.docs
index 06575bd..6106c24 100644
--- a/debian/koha-common.docs
+++ b/debian/koha-common.docs
@@ -1 +1,3 @@
 debian/docs/LEEME.Debian
+misc/release_notes/release_notes_3*.txt
+docs/history.txt
diff --git a/debian/koha-common.install b/debian/koha-common.install
index 810aadc..e215bde 100644
--- a/debian/koha-common.install
+++ b/debian/koha-common.install
@@ -1,4 +1,3 @@
-misc/release_notes/release_notes_3*.txt     usr/share/doc/koha-common
 debian/tmp/usr/*                            usr
 debian/tmp/etc/koha/searchengine
 debian/tmp/etc/koha/pazpar2
diff --git a/debian/rules b/debian/rules
index cbcfaaf..2073ad2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -103,3 +103,7 @@ override_dh_auto_install:
 	xsltproc --output $(TMP)/debian/tmp_docbook/ \
 	    /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl \
 	    debian/docs/*.xml
+
+override_dh_compress:
+	# exclude history.txt from compression as about.pl needs it uncompressed
+	dh_compress --exclude=history.txt
-- 
1.7.9.5


From tomascohen at gmail.com  Fri Aug 30 16:45:22 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Fri, 30 Aug 2013 11:45:22 -0300
Subject: [Koha-patches] [PATCH] Bug 10003: bash-completion for koha-list and
	some other script
Message-ID: <1377873922-5308-1-git-send-email-tomascohen@gmail.com>

This is an initial commit submitted for peer review. It implements bash-completion for the following commands:

 - koha-list
 - koha-enable
 - koha-disable
 - koha-email-enable
 - koha-email-disable
 - koha-enable-sip
 - koha-start-sip
 - koha-restart-sip
 - koha-stop-sip
 - koha-start-zebra
 - koha-stop-zebra
 - koha-restart-zebra

It is implemented in a way that it removes already used or mutually exclusive parameters (instance names, option switches).
I already have written completion for other (more complex) commands, But I belive a simpler patch is better to start with.

IMPORTANT: this patch relies on having the koha-list command available in the path. Also 10622 is needed for the SIP-related option switches.

To test:
 - Make sure you have bash-completion installed and enabled (IRC might help us if you encounter problems).
 - Apply the patch.
Option 1:
 - Pick the debian/koha-common.bash-completion file and do
   $ cp debian/koha-common.bash-completion /etc/bash_completion.d/koha-common
 - Open a new bash shell (I do it opening a new terminal on my Ubuntu box).
 - Type one of the listed commands...
  And repeatedly press <TAB>.
 - Enjoy, and signoff if you belive it is usable. Otherwise report back.
Option 2:
 - run:
   $ . debian/koha-common.bash-completion
 - Type one of the listed commands...
  And repeatedly press <TAB>.
 - Enjoy, and signoff if you belive it is usable. Otherwise report back.

Tests:
- Some koha-list option switches are mutually exclusive, -h should be available in any context
- koha-enable should only autocomplete disabled instances
- koha-disable should only autocomplete enabled instances
- koha-email-enable should only autocomplete email-disabled instances
- koha-email-disable should only autocomplete email-enabled instances
- koha-*-zebra scripts should only autocomplete enabled instances.
- koha-*-sip scripts should only autocomplete sip-enabled instances.

Regards
To+

Note: writing bash-completion routines is a bit hacky, I tried to make it the simplest way I could. Your comments are welcome.

Sponsored-by: Universidad Nacional de Cordoba
---
 debian/koha-common.bash-completion |  160 ++++++++++++++++++++++++++++++++++++
 debian/rules                       |    2 +-
 2 files changed, 161 insertions(+), 1 deletion(-)
 create mode 100644 debian/koha-common.bash-completion

diff --git a/debian/koha-common.bash-completion b/debian/koha-common.bash-completion
new file mode 100644
index 0000000..cfaaffb
--- /dev/null
+++ b/debian/koha-common.bash-completion
@@ -0,0 +1,160 @@
+#!/bin/bash
+#
+# koha-common.bash-completion script for koha-* commands
+#
+# This file is part of Koha.
+#
+# Copyright 2013 Universidad Nacional de Cordoba
+#                Tomas Cohen Arazi
+#
+# 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 3 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, see <http://www.gnu.org/licenses>.
+
+_build_substract_switches()
+{
+    local substract
+
+    for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do
+        if [[ ${COMP_WORDS[i]} == -* ]]; then
+            substract="$substract -e ${COMP_WORDS[i]}"
+        fi
+    done
+
+    echo "$substract"
+}
+
+_koha_list_cmd()
+{
+    local filter=$1
+
+    local cur substract instancelist
+    _get_comp_words_by_ref cur
+
+    # Build a list of the already used words
+    substract=`_build_substract_switches`
+
+    if [[ "$substract" != "" ]]; then
+        instancelist=$( koha-list $filter | grep -v -x $substract )
+    else
+        instancelist=$( koha-list $filer )
+    fi
+
+    COMPREPLY=( $(compgen -W "$instancelist" -- $cur ) )
+}
+
+_koha_email_disable()
+{
+    _koha_list_cmd "--email"
+    return 0
+}
+complete -F _koha_email_disable koha-email-disable
+
+_koha_email_enable()
+{
+    _koha_list_cmd "--noemail"
+    return 0
+}
+complete -F _koha_email_enable koha-email-enable
+
+_koha_sip_enabled_instances()
+{
+    _koha_list_cmd "--sip"
+    return 0
+}
+
+# koha-*-sip autocomplete with sip-enabled instances
+complete -F _koha_sip_enabled_instances koha-start-sip
+complete -F _koha_sip_enabled_instances koha-restart-sip
+complete -F _koha_sip_enabled_instances koha-stop-sip
+
+_koha_sip_disabled()
+{
+    _koha_list_cmd "--nosip"
+    return 0
+}
+
+# koha-enable-sip autocompletes with sip-disabled instances
+complete -F _koha_sip_disabled koha-enable-sip
+
+_koha_disabled_instances()
+{
+    _koha_list_cmd "--disabled"
+    return 0
+}
+
+_koha_enabled_instances()
+{
+    _koha_list_cmd "--enabled"
+    return 0
+}
+
+# koha-enable autocompletes with disabled instances
+complete -F _koha_disabled_instances koha-enable
+
+# koha-disable autocompletes with enabled instances
+complete -F _koha_enabled_instances koha-disable
+
+# koha-*-zebra autocomplete with enabled instances
+complete -F _koha_enabled_instances koha-start-zebra
+complete -F _koha_enabled_instances koha-restart-zebra
+complete -F _koha_enabled_instances koha-stop-zebra
+
+_koha_list()
+{
+    local cur opts substract
+
+    COMPREPLY=()
+    _get_comp_words_by_ref cur
+    opts="--enabled --disabled --email --noemail --sip --nosip --help -h"
+
+    # Build a list of the already used option switches
+    for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )); do
+        if [[ ${COMP_WORDS[i]} == -* ]]; then
+            case ${COMP_WORDS[i]} in
+                --disabled)
+                    substract="$substract -e --enabled"; ;;
+                --enabled)
+                    substract="$substract -e --disabled"; ;;
+                --email)
+                    substract="$substract -e --noemail"; ;;
+                --noemail)
+                    substract="$substract -e --email"; ;;
+                --sip)
+                    substract="$substract -e --nosip"; ;;
+                --nosip)
+                    substract="$substract -e --sip"; ;;
+                --help)
+                    substract="$substract -e -h"; ;;
+                -h)
+                    substract="$substract -e --help"; ;;
+            esac
+            substract="$substract -e ${COMP_WORDS[i]}"
+        fi
+    done
+
+    if [[ "$substract" != "" ]]; then
+        opts=$( echo $opts | sed -e 's/ /\n/g'  | grep -v -x $substract )
+    fi
+
+    COMPREPLY=( $(compgen -W "$opts" -- $cur ) )
+
+    return 0
+}
+complete -F _koha_list koha-list
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 4
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: ts=4 sw=4 et filetype=sh
diff --git a/debian/rules b/debian/rules
index cbcfaaf..ed1d34d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ TMP = $(CURDIR)/debian/tmp
 export PERL_MM_USE_DEFAULT=1
 
 %:
-	dh $@ --fail-missing
+	dh $@ --fail-missing --with bash-completion
 
 override_dh_gencontrol:
 	debian/bd-to-depends >> debian/koha-common.substvars
-- 
1.7.9.5


From tomascohen at gmail.com  Fri Aug 30 18:26:08 2013
From: tomascohen at gmail.com (Tomas Cohen Arazi)
Date: Fri, 30 Aug 2013 13:26:08 -0300
Subject: [Koha-patches] [PATCH] Bug 10624: 'status' option switch for the
	packages init script
Message-ID: <1377879968-16656-1-git-send-email-tomascohen@gmail.com>

This patch makes the init script return the status of the relevant processes.
It relies on the koha-list switches added by 10622, and is written on top of the patch from 10617 that cleaned the init script.

To test:
- Apply the patch (+ 10622 so the SIP part works), build package and install
- Run
 $ service koha-common status

Note: it can be tested just copying the debian/koha-common.init script to a server running koha-common instances and calling it
 $ ./koha-common.init status

If you don't have a patched koha-list command it will fail to report SIP servers status.

Regards
To+

Sponsored-by: Universidad Nacional de Cordoba
---
 debian/koha-common.init |   79 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 73 insertions(+), 6 deletions(-)

diff --git a/debian/koha-common.init b/debian/koha-common.init
index 2899343..4c730a9 100755
--- a/debian/koha-common.init
+++ b/debian/koha-common.init
@@ -70,6 +70,74 @@ do_reload() {
     koha-start-sip $(koha-list --enabled)
 }
 
+#
+# Function that checks zebrasrv is running for the specified instance
+#
+is_zebra_running()
+{
+    local instancename=$1
+
+    if daemon --name="$instancename-koha-zebra" \
+            --user="$instancename-koha.$instancename-koha" \
+            --running ; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+#
+# Function that checks SIP server is running for the specified instance
+#
+is_sip_running()
+{
+    local instancename=$1
+
+    if daemon --name="$instancename-koha-sip" \
+            --user="$instancename-koha.$instancename-koha" \
+            --running ; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+#
+# Function that shows the status of the zebrasrv daemon for
+# enabled instances
+#
+zebra_status()
+{
+    for instance in $(koha-list --enabled); do
+
+        log_daemon_msg "Zebra server running for instace $instance"
+
+        if is_zebra_running $instance ; then
+            log_end_msg 0
+        else
+            log_end_msg 1
+        fi
+    done
+}
+
+#
+# Function that shows the status of the SIP server daemon for
+# enabled instances
+#
+sip_status()
+{
+    for instance in $(koha-list --enabled --sip); do
+
+        log_daemon_msg "SIP server running for instace $instance"
+
+        if is_sip_running $instance ; then
+            log_end_msg 0
+        else
+            log_end_msg 1
+        fi
+    done
+}
+
 case "$1" in
   start)
 	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
@@ -108,13 +176,12 @@ case "$1" in
 		;;
 	esac
 	;;
-# TODO: Implement this. It should check every daemon is running
-#  status)
-#        status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-#        ;;
+  status)
+        zebra_status
+        sip_status
+        ;;
   *)
-	#echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
 	exit 3
 	;;
 esac
-- 
1.7.9.5