diff --git a/C4/Auth.pm b/C4/Auth.pm
index 8f42d765f1..d73f19b692 100644
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -351,6 +351,8 @@ sub get_template_and_user {
OpacMainUserBlock => "" . C4::Context->preference("OpacMainUserBlock"),
OpacNav => "" . C4::Context->preference("OpacNav"),
OpacPasswordChange => C4::Context->preference("OpacPasswordChange"),
+ OPACPatronDetails => C4::Context->preference("OPACPatronDetails"),
+ OPACFinesTab => C4::Context->preference("OPACFinesTab"),
OpacTopissue => C4::Context->preference("OpacTopissue"),
RequestOnOpac => C4::Context->preference("RequestOnOpac"),
TemplateEncoding => "". C4::Context->preference("TemplateEncoding"),
diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 05f53966f9..d0d5331a31 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -318,6 +318,8 @@ $tabsysprefs{OPACSearchForTitleIn} = "OPAC";
$tabsysprefs{OPACShelfBrowser} = "OPAC";
$tabsysprefs{OPACDisplayRequestPriority} = "OPAC";
$tabsysprefs{OPACAllowHoldDateInFuture} = "OPAC";
+$tabsysprefs{OPACPatronDetails} = "OPAC";
+$tabsysprefs{OPACFinesTab} = "OPAC";
# OPAC
$tabsysprefs{SearchMyLibraryFirst} = "OPAC";
diff --git a/circ/circulation.pl b/circ/circulation.pl
index 6d791241f5..de6013a09e 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -425,13 +425,14 @@ my @previousissues;
## ADDED BY JF: new itemtype issuingrules counter stuff
my $issued_itemtypes_count;
my @issued_itemtypes_count_loop;
+my $totalprice = 0;
if ($borrower) {
# get each issue of the borrower & separate them in todayissues & previous issues
my ($issueslist) = GetPendingIssues($borrower->{'borrowernumber'});
-
# split in 2 arrays for today & previous
foreach my $it ( @$issueslist ) {
+ my $itemtypeinfo = getitemtypeinfo( (C4::Context->preference('item-level_itypes')) ? $it->{'itype'} : $it->{'itemtype'} );
# set itemtype per item-level_itype syspref - FIXME this is an ugly hack
$it->{'itemtype'} = ( C4::Context->preference( 'item-level_itypes' ) ) ? $it->{'itype'} : $it->{'itemtype'};
@@ -447,8 +448,13 @@ if ($borrower) {
$it->{'can_renew'} = $can_renew;
$it->{'can_confirm'} = !$can_renew && !$restype;
$it->{'renew_error'} = $restype;
+ $it->{'checkoutdate'} = C4::Dates->new($it->{'issuedate'},'iso')->output('syspref');
+ $totalprice += $it->{'replacementprice'};
+ $it->{'itemtype'} = $itemtypeinfo->{'description'};
+ $it->{'itemtype_image'} = $itemtypeinfo->{'imageurl'};
$it->{'dd'} = format_date($it->{'date_due'});
+ $it->{'issuedate'} = format_date($it->{'issuedate'});
$it->{'od'} = ( $it->{'date_due'} lt $todaysdate ) ? 1 : 0 ;
($it->{'author'} eq '') and $it->{'author'} = ' ';
$it->{'renew_failed'} = $renew_failed{$it->{'itemnumber'}};
@@ -619,6 +625,8 @@ foreach my $flag ( sort keys %$flags ) {
my $amountold = $borrower->{flags}->{'CHARGES'}->{'message'} || 0;
$amountold =~ s/^.*\$//; # remove upto the $, if any
+my ( $total, $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
+
if ( $borrower->{'category_type'} eq 'C') {
my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
my $cnt = scalar(@$catcodes);
@@ -676,6 +684,8 @@ $template->param(
duedatespec => $duedatespec,
message => $message,
CGIselectborrower => $CGIselectborrower,
+ totalprice => sprintf("%.2f", $totalprice),
+ totaldue => sprintf("%.2f", $total),
todayissues => \@todaysissues,
previssues => \@previousissues,
inprocess => $inprocess,
diff --git a/docs/history.txt b/docs/history.txt
index a1d48c2aaf..a9df0154b9 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -440,3 +440,5 @@ August 1 2009 Sébastien Hinderer becomes the 96th committer to have a patched a
August 30 2009 John A. Graziano Memorial Library contributes a icon for Bridge Icon set
September 5 2009 UNIMARC XSLT cleanup and new features Sponsored by BULAC, www.bulac.fr
September 5 2009 Labels rewrite committed, sponsored by Foundations Bible College & Seminary, Dunn, NC USA
+September 6 2009 Katrin Fischer becomes the 97th committer to have a patch accepted developer
+September 6 2009 Wolfgang Heymans becomes the 98th committer to have a patch accepted developer
diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql
index 0adefbc752..ab88869c9f 100644
--- a/installer/data/mysql/en/mandatory/sysprefs.sql
+++ b/installer/data/mysql/en/mandatory/sysprefs.sql
@@ -256,4 +256,6 @@ INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanatio
INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'ReturnToShelvingCart', '0', '', 'If set, when any item is ''checked in'', it''s location code will be changed to CART.', 'YesNo');
INSERT INTO `systempreferences` ( `variable` , `value` , `options` , `explanation` , `type` ) VALUES ( 'DisplayClearScreenButton', '0', '', 'If set to ON, a clear screen button will appear on the circulation page.', 'YesNo');
INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('HidePatronName', '0', '', 'If this is switched on, patron''s cardnumber will be shown instead of their name on the holds and catalog screens', 'YesNo');
-INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACSearchForTitleIn','
\n\n','Enter the HTML that will appear in the \'Search for this title in\' box on the detail page in the OPAC. Enter TITLE, AUTHOR, or ISBN in place of their respective variables in the URL. Leave blank to disable \'More Searches\' menu.','70|10','Textarea')
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACSearchForTitleIn','Other Libraries (WorldCat)\nOther Databases (Google Scholar)\nOnline Stores (Bookfinder.com)','Enter the HTML that will appear in the \'Search for this title in\' box on the detail page in the OPAC. Enter {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the URL. Leave blank to disable \'More Searches\' menu.','70|10','Textarea');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACPatronDetails','1','If OFF the patron details tab in the OPAC is disabled.','','YesNo');
+INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACFinesTab','1','If OFF the patron fines tab in the OPAC is disabled.','','YesNo');
\ No newline at end of file
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 23e5b10b11..cdf7f423c7 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2138,6 +2138,8 @@ CREATE TABLE language_subtag_registry (
type varchar(25), -- language-script-region-variant-extension-privateuse
description varchar(25), -- only one of the possible descriptions for ease of reference, see language_descriptions for the complete list
added date,
+ id int(11) NOT NULL auto_increment,
+ PRIMARY KEY (`id`),
KEY `subtag` (`subtag`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -2148,6 +2150,8 @@ DROP TABLE IF EXISTS language_rfc4646_to_iso639;
CREATE TABLE language_rfc4646_to_iso639 (
rfc4646_subtag varchar(25),
iso639_2_code varchar(25),
+ id int(11) NOT NULL auto_increment,
+ PRIMARY KEY (`id`),
KEY `rfc4646_subtag` (`rfc4646_subtag`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
@@ -2157,6 +2161,8 @@ CREATE TABLE language_descriptions (
type varchar(25),
lang varchar(25),
description varchar(255),
+ id int(11) NOT NULL auto_increment,
+ PRIMARY KEY (`id`),
KEY `lang` (`lang`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 80cce211d5..6d648dd144 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -2614,6 +2614,36 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
print "Upgrade to $DBversion done (bug 1600, bug 3454: add altcontactcountry and B_address2 to borrowers and deletedborrowers)\n";
}
+$DBversion = '3.01.00.055';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+ $dbh->do(qq|UPDATE systempreferences set explanation='Enter the HTML that will appear in the ''Search for this title in'' box on the detail page in the OPAC. Enter {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the URL. Leave blank to disable ''More Searches'' menu.', value='Other Libraries (WorldCat)\nOther Databases (Google Scholar)\nOnline Stores (Bookfinder.com)' WHERE variable='OPACSearchForTitleIn'|);
+ SetVersion ($DBversion);
+ print "Upgrade to $DBversion done (changed OPACSearchForTitleIn per requests in bug 1934)\n";
+}
+
+$DBversion = '3.01.00.056';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+ $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACPatronDetails','1','If OFF the patron details tab in the OPAC is disabled.','','YesNo');");
+ SetVersion ($DBversion);
+ print "Upgrade to $DBversion done (Bug 1172 : Add OPACPatronDetails syspref)\n";
+}
+
+$DBversion = '3.01.00.057';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+ $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACFinesTab','1','If OFF the patron fines tab in the OPAC is disabled.','','YesNo');");
+ SetVersion ($DBversion);
+ print "Upgrade to $DBversion done (Bug 2576 : Add OPACFinesTab syspref)\n";
+}
+
+$DBversion = '3.01.00.058';
+if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
+ $dbh->do("ALTER TABLE `language_subtag_registry` ADD `id` INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY;");
+ $dbh->do("ALTER TABLE `language_rfc4646_to_iso639` ADD `id` INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY;");
+ $dbh->do("ALTER TABLE `language_descriptions` ADD `id` INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY;");
+ SetVersion ($DBversion);
+ print "Upgrade to $DBversion done (Added primary keys to language tables)\n";
+}
+
=item DropAllForeignKeys($table)
Drop all foreign keys of the table $table
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
index 013a30373d..c43201a96f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -21,7 +21,7 @@ $.tablesorter.addParser({
$.tablesorter.defaults.widgets = ['zebra'];
$("#issuest").tablesorter({
dateFormat: 'uk',
- headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false}}
+ headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
});
$("#issuest").bind("sortEnd",function() {
$("#previous").parents("tr").remove(); // 'previous checkouts' header chokes table sorter
@@ -41,14 +41,91 @@ $.tablesorter.addParser({
}
} ).attr( 'checked', false );
- $("td").click(function(e){
- if(e.target.tagName.toLowerCase() == 'td'){
- $(this).find("input:checkbox").each( function() {
- $(this).attr('checked', !$(this).attr('checked'));
- });
- }
- });
+
+var allcheckboxes = $(".checkboxed");
+ $("#renew_all").click(function(){
+ $(allcheckboxes).checkCheckboxes(":input[name*=items]");
+ $(allcheckboxes).unCheckCheckboxes(":input[name*=barcodes]");
+ });
+ $("#return_all").click(function(){
+ $(allcheckboxes).checkCheckboxes(":input[name*=barcodes]");
+ $(allcheckboxes).unCheckCheckboxes(":input[name*=items]");
+ });
+ $("#CheckAllitems").click(function(){
+ $(allcheckboxes).checkCheckboxes(":input[name*=items]");
+ $(allcheckboxes).unCheckCheckboxes(":input[name*=barcodes]"); return false;
+ });
+ $("#CheckNoitems").click(function(){
+ $(allcheckboxes).unCheckCheckboxes(":input[name*=items]"); return false;
+ });
+ $("#CheckAllreturns").click(function(){
+ $(allcheckboxes).checkCheckboxes(":input[name*=barcodes]");
+ $(allcheckboxes).unCheckCheckboxes(":input[name*=items]"); return false;
+ });
+ $("#CheckNoreturns" ).click(function(){
+ $(allcheckboxes).unCheckCheckboxes(":input[name*=barcodes]"); return false;
+ });
+
+
+
+ $( '#override_limit' ).click( function () {
+ if ( this.checked ) {
+ $( '.renewals-allowed' ).show(); $( '.renewals-disabled' ).hide();
+ } else {
+ $( '.renewals-allowed' ).hide(); $( '.renewals-disabled' ).show();
+ }
+ } ).attr( 'checked', false );
+
+
+ $("td").click(function(e){
+ if(e.target.tagName.toLowerCase() == 'td'){
+ $(this).find("input:checkbox").each( function() {
+ $(this).attr('checked', !$(this).attr('checked'));
+ if($(this).attr('checked')){
+ $(this).parent().siblings().find("input:checkbox").each(function(){
+ if($(this).attr('checked')){ $(this).attr('checked',''); }
+ });
+ }
+ });
+ }
+ });
+
});
+function uncheck_sibling(me){
+nodename=me.getAttribute("name");
+if (nodename =="barcodes[]"){
+ var Node=me.parentNode.previousSibling;
+ while (Node.nodeName!="TD"){Node=Node.previousSibling}
+ var Nodes=Node.childNodes;
+ for (var i=0;i
@@ -428,7 +505,7 @@ No patron matched
0 Checkouts
- Holds(s)
+ Hold(s)
0 Holds
@@ -438,23 +515,54 @@ No patron matched
-
@@ -596,21 +711,22 @@ No patron matched
+
-
Patron has no pending holds.
+
Patron has nothing on hold.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 8e6b73c71e..240e75e44a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -14,10 +14,10 @@ $.tablesorter.addParser({
});
$(document).ready(function() {
$('#finesholdsissues > ul').tabs();
+ $.tablesorter.defaults.widgets = ['zebra'];
$("#issuest").tablesorter({
dateFormat: 'uk',
- sortList: [[1,0]],
- headers: { 1: { sorter: 'articles' },4:{sorter:false},5: { sorter: false },6:{sorter:false},7:{sorter:false}}
+ headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
});
$("#holdst").tablesorter({
dateFormat: 'uk',
@@ -368,13 +368,16 @@ if (nodename =="barcodes[]"){
-
Fines and Charges
Total due:
@@ -383,7 +386,6 @@ if (nodename =="barcodes[]"){